Skip to content

⬆️ Upgraded to .NET Core 3.1 (LTS) #10

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

⬆️ Upgraded to .NET Core 3.1 (LTS) #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1b22df
:arrow_up: Upgraded to .NET Core 3.1 (LTS)
Flaflo Dec 14, 2020
5eeb873
:arrow_up: Upgraded Demo project to .NET Core 3.1 (LTS)
Flaflo Dec 14, 2020
24d2f5b
:ambulance: Made demo a runnable winexe
Flaflo Dec 14, 2020
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
102 changes: 9 additions & 93 deletions Demo/Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +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>{CFD9151B-59C7-44A7-A93A-22EC9385738D}</ProjectGuid>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>9</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<UseWindowsForms>true</UseWindowsForms>
<StartupObject>Demo.Program</StartupObject>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Demo</RootNamespace>
<AssemblyName>Demo</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
</Reference>
<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.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<PackageReference Include="fernandreu.ScintillaNET" Version="4.0.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ScintillaNet FindReplaceDialog\ScintillaNET FindReplaceDialog.csproj">
<Project>{548fd833-9a3b-41bb-9850-570afe9a91b7}</Project>
<Name>ScintillaNET FindReplaceDialog</Name>
</ProjectReference>
<ProjectReference Include="..\ScintillaNet FindReplaceDialog\ScintillaNET FindReplaceDialog.csproj" />
</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>
6 changes: 4 additions & 2 deletions Demo/Form1.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Demo/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

namespace Demo
{
static class Program
public static class Program
{
/// <summary>
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main()
public static void Main(string[] args)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Expand Down
36 changes: 0 additions & 36 deletions Demo/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ScintillaNet FindReplaceDialog/FindReplace/FindReplace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public CharacterRange Find(int startPos, int endPos, Regex findExpression, bool
return Find(new CharacterRange(startPos, endPos), findExpression, searchUp);
}

public unsafe CharacterRange Find(int startPos, int endPos, string searchString, SearchFlags flags)
public CharacterRange Find(int startPos, int endPos, string searchString, SearchFlags flags)
{
if (string.IsNullOrEmpty(searchString))
return new CharacterRange();
Expand Down
36 changes: 0 additions & 36 deletions ScintillaNet FindReplaceDialog/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

139 changes: 10 additions & 129 deletions ScintillaNet FindReplaceDialog/ScintillaNET FindReplaceDialog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,129 +1,10 @@
<?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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{548FD833-9A3B-41BB-9850-570AFE9A91B7}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ScintillaNET_FindReplaceDialog</RootNamespace>
<AssemblyName>ScintillaNET FindReplaceDialog</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>bin\Debug\ScintillaNET FindReplaceDialog.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>bin\Release\ScintillaNET FindReplaceDialog.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CharacterRange.cs" />
<Compile Include="FindAllResults\FindAllResultsPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="FindAllResults\FindAllResultsPanel.Designer.cs">
<DependentUpon>FindAllResultsPanel.cs</DependentUpon>
</Compile>
<Compile Include="FindReplace\FindOption.cs" />
<Compile Include="FindReplace\FindReplace.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="FindReplace\FindReplaceDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FindReplace\FindReplaceDialog.Designer.cs">
<DependentUpon>FindReplaceDialog.cs</DependentUpon>
</Compile>
<Compile Include="FindReplace\IncrementalSearcher.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="FindReplace\IncrementalSearcher.Designer.cs">
<DependentUpon>IncrementalSearcher.cs</DependentUpon>
</Compile>
<Compile Include="FindReplace\ToolStripIncrementalSearcher.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="GoTo\GoTo.cs" />
<Compile Include="GoTo\GoToDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GoTo\GoToDialog.Designer.cs">
<DependentUpon>GoToDialog.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="FindAllResults\FindAllResultsPanel.resx">
<DependentUpon>FindAllResultsPanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FindReplace\FindReplaceDialog.resx">
<DependentUpon>FindReplaceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FindReplace\IncrementalSearcher.resx">
<DependentUpon>IncrementalSearcher.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GoTo\GoToDialog.resx">
<DependentUpon>GoToDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="Resources\Clock.ico" />
<Content Include="Resources\Clock.png" />
<Content Include="Resources\DeleteHS.png" />
<Content Include="Resources\GoToNextMessage.png" />
<Content Include="Resources\GoToPreviousMessage.png" />
<Content Include="Resources\LineColorHS.png" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</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 Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>9</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="fernandreu.ScintillaNET" Version="4.0.4" />
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions ScintillaNet FindReplaceDialog/packages.config
View file
Open in desktop

This file was deleted.