Skip to content

Commit

Permalink
Use SDK-style project files
Browse files Browse the repository at this point in the history
  • Loading branch information
Sparronator9999 committed Jul 24, 2024
1 parent c8048d0 commit 6ef8ef5
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 382 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
run: msbuild.exe MSIFanControl.sln /nologo /nr:false /p:DeployOnBuild=true /p:platform="Any CPU" /p:configuration="${{ matrix.configuration }}"

- name: Copy fan configs to build path
run: mkdir MSIFanControl.GUI\bin\${{ matrix.configuration }}\Configs && copy Configs\* MSIFanControl.GUI\bin\${{ matrix.configuration }}\Configs
run: mkdir MSIFanControl.GUI\bin\${{ matrix.configuration }}\net48\Configs && copy Configs\* MSIFanControl.GUI\bin\${{ matrix.configuration }}\Configs\net48

- name: Upload build artifact
uses: actions/upload-artifact@v4
with:
name: "MSIFanControl-${{ matrix.configuration }}"
path: "./MSIFanControl.GUI/bin/${{ matrix.configuration }}/"
path: "./MSIFanControl.GUI/bin/${{ matrix.configuration }}/net48/"
compression-level: 9
55 changes: 5 additions & 50 deletions MSIFanControl.Config/MSIFanControl.Config.csproj
Original file line number Diff line number Diff line change
@@ -1,57 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net48</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{F4FD34BF-5F9A-4271-A1E4-515C82A189F6}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MSIFanControl.Config</RootNamespace>
<AssemblyName>MSIFanControl.Config</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="FanRPMConfig.cs" />
<Compile Include="FanConfig.cs" />
<Compile Include="FanControlConfig.cs" />
<Compile Include="FanCurveConfig.cs" />
<Compile Include="InvalidConfigException.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RegConfig.cs" />
<Compile Include="TempThreshold.cs" />
<Compile Include="ChargeLimitConfig.cs" />
<Compile Include="FullBlastConfig.cs" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
63 changes: 8 additions & 55 deletions MSIFanControl.ECAccess/MSIFanControl.ECAccess.csproj
Original file line number Diff line number Diff line change
@@ -1,78 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net48</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<OutputType>Library</OutputType>
<AssemblyName>MSIFanControl.ECAccess</AssemblyName>
<Title>EC access library</Title>
<Authors>Sparronator9999</Authors>
<Copyright>Copyright © 2023 Sparronator9999</Copyright>
<PackageLicenseExpression> GPL-3.0-or-later</PackageLicenseExpression>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<ProjectGuid>{EDCEB6F6-B97C-4343-969E-AA58F887A0FE}</ProjectGuid>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<RootNamespace>MSIFanControl.ECAccess</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;X64</DefineConstants>
<Optimize>true</Optimize>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Driver.cs" />
<Compile Include="EC.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Win32\AdvApi32.cs" />
<Compile Include="Win32\Kernel32.cs" />
</ItemGroup>
<ItemGroup>
<None Include="WinRing0.sys">
<None Update="WinRing0.sys">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="WinRing0x64.sys">
<None Update="WinRing0x64.sys">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MSIFanControl.Logging\MSIFanControl.Logs.csproj">
<Project>{5c611048-093e-48ac-b525-5c24817081bb}</Project>
<Name>MSIFanControl.Logs</Name>
</ProjectReference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<PropertyGroup />
</Project>
118 changes: 15 additions & 103 deletions MSIFanControl.GUI/MSIFanControl.GUI.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net48</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<OutputType>WinExe</OutputType>
<AssemblyName>MSIFanControl</AssemblyName>
<Title>MSI Fan Control</Title>
<Authors>Sparronator9999</Authors>
<Copyright>Copyright © Sparronator9999 2023</Copyright>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
<PlatformTarget>AnyCPU</PlatformTarget>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<ProjectGuid>{5025D7BC-1BE1-4B72-B30A-893B25F73596}</ProjectGuid>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -31,116 +23,30 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>fan.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>MSIFanControl.GUI</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<StartupObject>MSIFanControl.GUI.Program</StartupObject>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Dialogs\CrashDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\CrashDialog.Designer.cs">
<DependentUpon>CrashDialog.cs</DependentUpon>
</Compile>
<Compile Include="MainWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow.Designer.cs">
<DependentUpon>MainWindow.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\TextInputDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\TextInputDialog.Designer.cs">
<DependentUpon>TextInputDialog.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utils.cs" />
<Compile Include="Strings.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Dialogs\CrashDialog.resx">
<DependentUpon>CrashDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\TextInputDialog.resx">
<DependentUpon>TextInputDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Strings.resx" />
<None Include="MainWindow.resx">
<DependentUpon>MainWindow.cs</DependentUpon>
</None>
<EmbeddedResource Include="Program.resx">
<Generator>
</Generator>
<DependentUpon>Program.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="fan.ico" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MSIFanControl.Config\MSIFanControl.Config.csproj">
<Project>{f4fd34bf-5f9a-4271-a1e4-515c82a189f6}</Project>
<Name>MSIFanControl.Config</Name>
</ProjectReference>
<ProjectReference Include="..\MSIFanControl.Service\MSIFanControl.Service.csproj">
<Project>{d99c674a-7949-4402-a9de-088c1f7bb361}</Project>
<Name>MSIFanControl.Service</Name>
</ProjectReference>
<ProjectReference Include="..\MSIFanControl.IPC\MSIFanControl.IPC.csproj">
<Project>{73152691-3cde-46df-8d04-7117747dffe7}</Project>
<Name>MSIFanControl.IPC</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="app.manifest" />
<ProjectReference Include="..\MSIFanControl.Config\MSIFanControl.Config.csproj" />
<ProjectReference Include="..\MSIFanControl.Service\MSIFanControl.Service.csproj" />
<ProjectReference Include="..\MSIFanControl.IPC\MSIFanControl.IPC.csproj" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
Expand All @@ -157,5 +63,11 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="MainWindow.resx" />
</ItemGroup>
</Project>
54 changes: 5 additions & 49 deletions MSIFanControl.IPC/MSIFanControl.IPC.csproj
Original file line number Diff line number Diff line change
@@ -1,62 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net48</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<OutputType>Library</OutputType>
<AssemblyName>MSIFanControl.IPC</AssemblyName>
<Title>Named Pipe Wrapper library</Title>
<Description>A simple, easy to use, strongly-typed wrapper around .NET named pipes.</Description>
<Copyright>Copyright © 2013 Andrew C. Dvorak</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AssemblyVersion>1.4.0.0</AssemblyVersion>
<FileVersion>1.4.0.0</FileVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<ProjectGuid>{73152691-3CDE-46DF-8D04-7117747DFFE7}</ProjectGuid>
<TargetFrameworkProfile />
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="IO\PipeStreamReader.cs" />
<Compile Include="IO\PipeStreamWrapper.cs" />
<Compile Include="IO\PipeStreamWriter.cs" />
<Compile Include="NamedPipeClient.cs" />
<Compile Include="NamedPipeConnection.cs" />
<Compile Include="NamedPipeServer.cs" />
<Compile Include="PipeExceptionEventHandler.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceCommand.cs" />
<Compile Include="ServiceResponse.cs" />
<Compile Include="Threading\Worker.cs" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Loading

0 comments on commit 6ef8ef5

Please sign in to comment.