Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernise solution, update to 1.4. #5

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
63 changes: 0 additions & 63 deletions .gitattributes

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/.idea.ColourPicker/.idea/contentModel.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/.idea.ColourPicker/.idea/indexLayout.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/.idea.ColourPicker/.idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/.idea.ColourPicker/.idea/vcs.xml

This file was deleted.

376 changes: 0 additions & 376 deletions .idea/.idea.ColourPicker/.idea/workspace.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/.idea.ColourPicker/riderModule.iml

This file was deleted.

Binary file modified 0ColourPicker.dll
Binary file not shown.
72 changes: 13 additions & 59 deletions ColourPicker.csproj
Original file line number Diff line number Diff line change
@@ -1,62 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" 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>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{AEBDCE54-F011-4684-BC9C-A3767E59B58B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ColourPicker</RootNamespace>
<AssemblyName>0ColourPicker</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFramework>net472</TargetFramework>
<OutputPath>./</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<AssemblyName>0ColourPicker</AssemblyName>
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>.\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Assemblies\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\dlls\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine">
<HintPath>..\..\..\dlls\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Dialog_ColourPicker.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RecentColours.cs" />
<Compile Include="TextField.cs" />

<ItemGroup>
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4055-beta" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
17 changes: 10 additions & 7 deletions ColourPicker.sln
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio Version 17
VisualStudioVersion = 17.4.33006.217
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColourPicker", "ColourPicker.csproj", "{AEBDCE54-F011-4684-BC9C-A3767E59B58B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColourPicker", "ColourPicker.csproj", "{E963A6F6-BD2E-40DE-B0A5-A273A0256046}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AEBDCE54-F011-4684-BC9C-A3767E59B58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AEBDCE54-F011-4684-BC9C-A3767E59B58B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AEBDCE54-F011-4684-BC9C-A3767E59B58B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AEBDCE54-F011-4684-BC9C-A3767E59B58B}.Release|Any CPU.Build.0 = Release|Any CPU
{E963A6F6-BD2E-40DE-B0A5-A273A0256046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E963A6F6-BD2E-40DE-B0A5-A273A0256046}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E963A6F6-BD2E-40DE-B0A5-A273A0256046}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E963A6F6-BD2E-40DE-B0A5-A273A0256046}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E3364498-996F-4B88-9F05-DE984EEF666D}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Dialog_ColourPicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ public override void OnAcceptKeyPressed()
[Conditional("DEBUG")]
public static void Debug( string msg )
{
Log.Message( "ColourPicker :: " + msg, true );
Log.Message( "ColourPicker :: " + msg);
}
}
}
35 changes: 0 additions & 35 deletions Properties/AssemblyInfo.cs

This file was deleted.