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

Upgrade to net8, migrated to sdk style project files, upgraded vcproj… #234

Open
wants to merge 1 commit 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
11 changes: 5 additions & 6 deletions Crypt/Crypt.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,17 @@
<ItemGroup>
<None Include="Crypt.def" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Razor\Razor.csproj">
<Project>{b24e4fb1-4936-4544-9e88-f3ff9b04fdba}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Image Include="App.ico" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Crypt.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Razor\Razor.csproj">
<Project>{b24e4fb1-4936-4544-9e88-f3ff9b04fdba}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
1 change: 1 addition & 0 deletions FastColoredTextBox/FastColoredTextBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
using System.Windows.Forms;
using System.Windows.Forms.Design;
using Microsoft.Win32;
using MethodInvoker = System.Windows.Forms.MethodInvoker;
using Timer = System.Windows.Forms.Timer;

namespace FastColoredTextBoxNS
Expand Down
167 changes: 5 additions & 162 deletions FastColoredTextBox/FastColoredTextBox.csproj
Original file line number Diff line number Diff line change
@@ -1,173 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6DD14A85-CCFC-4774-BD26-0F5772512319}</ProjectGuid>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FastColoredTextBoxNS</RootNamespace>
<AssemblyName>FastColoredTextBox</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\Win32\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>
</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\Win32\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>FCTB_key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\bin\x64\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AutocompleteItem.cs" />
<Compile Include="AutocompleteMenu.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Bookmarks.cs" />
<Compile Include="Char.cs" />
<Compile Include="DocumentMap.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="EncodingDetector.cs" />
<Compile Include="ExportToHTML.cs" />
<Compile Include="ExportToRTF.cs" />
<Compile Include="GoToForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GoToForm.Designer.cs">
<DependentUpon>GoToForm.cs</DependentUpon>
</Compile>
<Compile Include="Hints.cs" />
<Compile Include="HotkeysEditorForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="HotkeysEditorForm.Designer.cs">
<DependentUpon>HotkeysEditorForm.cs</DependentUpon>
</Compile>
<Compile Include="LinesAccessor.cs" />
<Compile Include="MacrosManager.cs" />
<Compile Include="NativeMethods.cs" />
<Compile Include="PlatformType.cs" />
<Compile Include="Hotkeys.cs" />
<Compile Include="Ruler.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Ruler.Designer.cs">
<DependentUpon>Ruler.cs</DependentUpon>
</Compile>
<Compile Include="SyntaxDescriptor.cs" />
<Compile Include="SyntaxHighlighter.cs" />
<Compile Include="ReplaceForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ReplaceForm.Designer.cs">
<DependentUpon>ReplaceForm.cs</DependentUpon>
</Compile>
<Compile Include="FastColoredTextBox.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="CommandManager.cs" />
<Compile Include="Commands.cs" />
<Compile Include="FindForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FindForm.Designer.cs">
<DependentUpon>FindForm.cs</DependentUpon>
</Compile>
<Compile Include="LimitedStack.cs" />
<Compile Include="Line.cs" />
<Compile Include="Place.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Range.cs" />
<Compile Include="Style.cs" />
<Compile Include="TextSource.cs" />
<Compile Include="TypeDescriptor.cs" />
<Compile Include="FileTextSource.cs" />
<Compile Include="UnfocusablePanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="VisualMarker.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="FastColoredTextBox.resx">
<DependentUpon>FastColoredTextBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FindForm.resx">
<DependentUpon>FindForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GoToForm.resx">
<DependentUpon>GoToForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="HotkeysEditorForm.resx">
<DependentUpon>HotkeysEditorForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ReplaceForm.resx">
<DependentUpon>ReplaceForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="FCTB_key.snk" />
</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>
36 changes: 0 additions & 36 deletions FastColoredTextBox/Properties/AssemblyInfo.cs

This file was deleted.

6 changes: 3 additions & 3 deletions Platform/Platform.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
Expand All @@ -41,13 +41,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
46 changes: 26 additions & 20 deletions Razor.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Razor", "Razor\Razor.csproj", "{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Razor", "Razor\Razor.csproj", "{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypt", "Crypt\Crypt.vcxproj", "{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}"
ProjectSection(ProjectDependencies) = postProject
Expand All @@ -23,7 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Platform", "Platform\Platform.vcxproj", "{DB18390C-8AD4-4E69-8A5A-171260F7D74A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FastColoredTextBox", "FastColoredTextBox\FastColoredTextBox.csproj", "{6DD14A85-CCFC-4774-BD26-0F5772512319}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastColoredTextBox", "FastColoredTextBox\FastColoredTextBox.csproj", "{6DD14A85-CCFC-4774-BD26-0F5772512319}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -35,58 +35,64 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|Any CPU.ActiveCfg = Debug|x86
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|Any CPU.Build.0 = Debug|x86
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|x64.ActiveCfg = Debug|x64
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|x64.Build.0 = Debug|x64
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|x86.ActiveCfg = Debug|x86
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|x86.Build.0 = Debug|x86
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|Any CPU.ActiveCfg = Release|x86
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|Any CPU.Build.0 = Release|x86
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|x64.ActiveCfg = Release|x64
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|x64.Build.0 = Release|x64
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|x86.ActiveCfg = Release|x86
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|x86.Build.0 = Release|x86
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|x64.ActiveCfg = Debug|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|x64.Build.0 = Debug|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|x86.ActiveCfg = Debug|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Debug|x86.Build.0 = Debug|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|Any CPU.Build.0 = Release|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|x64.ActiveCfg = Release|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|x64.Build.0 = Release|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|x86.ActiveCfg = Release|Any CPU
{B24E4FB1-4936-4544-9E88-F3FF9B04FDBA}.Release|x86.Build.0 = Release|Any CPU
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Debug|Any CPU.ActiveCfg = Debug|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Debug|Any CPU.Build.0 = Debug|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Debug|x64.ActiveCfg = Debug|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Debug|x64.Build.0 = Debug|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Debug|x86.ActiveCfg = Debug|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Debug|x86.Build.0 = Debug|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Release|Any CPU.ActiveCfg = Release|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Release|Any CPU.Build.0 = Release|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Release|x64.ActiveCfg = Release|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Release|x64.Build.0 = Release|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Release|x86.ActiveCfg = Release|Win32
{B32A4D9E-3AF1-4C75-989D-D62C4E8F08B1}.Release|x86.Build.0 = Release|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Debug|Any CPU.ActiveCfg = Debug|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Debug|Any CPU.Build.0 = Debug|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Debug|x64.ActiveCfg = Debug|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Debug|x64.Build.0 = Debug|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Debug|x86.ActiveCfg = Debug|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Debug|x86.Build.0 = Debug|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Release|Any CPU.ActiveCfg = Release|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Release|Any CPU.Build.0 = Release|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Release|x64.ActiveCfg = Release|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Release|x64.Build.0 = Release|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Release|x86.ActiveCfg = Release|Win32
{F308E8D5-2B4F-40AD-9BF7-9A8F5DDA420D}.Release|x86.Build.0 = Release|Win32
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Debug|Any CPU.ActiveCfg = Debug|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Debug|Any CPU.Build.0 = Debug|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Debug|x64.ActiveCfg = Debug|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Debug|x86.ActiveCfg = Debug|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Debug|x86.Build.0 = Debug|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Debug|x64.Build.0 = Debug|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Debug|x86.ActiveCfg = Debug|Win32
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Debug|x86.Build.0 = Debug|Win32
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Release|Any CPU.ActiveCfg = Release|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Release|Any CPU.Build.0 = Release|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Release|x64.ActiveCfg = Release|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Release|x64.Build.0 = Release|x64
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Release|x86.ActiveCfg = Release|Win32
{DB18390C-8AD4-4E69-8A5A-171260F7D74A}.Release|x86.Build.0 = Release|Win32
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Debug|x64.ActiveCfg = Debug|x64
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Debug|x64.Build.0 = Debug|x64
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Debug|x64.ActiveCfg = Debug|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Debug|x64.Build.0 = Debug|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Debug|x86.ActiveCfg = Debug|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Debug|x86.Build.0 = Debug|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Release|Any CPU.Build.0 = Release|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Release|x64.ActiveCfg = Release|x64
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Release|x64.Build.0 = Release|x64
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Release|x64.ActiveCfg = Release|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Release|x64.Build.0 = Release|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Release|x86.ActiveCfg = Release|Any CPU
{6DD14A85-CCFC-4774-BD26-0F5772512319}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
Loading