Skip to content

Commit 81ab85b

Browse files
committed
Add Copyright messages, License, and installer
1 parent 9727640 commit 81ab85b

39 files changed

+1880
-72
lines changed

.editorconfig

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
# Rules in this file were initially inferred by Visual Studio IntelliCode from the D:\keith\Documents\Repos\AndroidBotEngine codebase based on best match to current usage at 13/05/2022
2+
# You can modify the rules from these initially generated values to suit your own policies
3+
# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
4+
[*.cs]
5+
6+
7+
#Core editorconfig formatting - indentation
8+
9+
#use soft tabs (spaces) for indentation
10+
indent_style = space
11+
12+
#Formatting - indentation options
13+
14+
#indent switch case contents.
15+
csharp_indent_case_contents = true
16+
#indent switch labels
17+
csharp_indent_switch_labels = true
18+
19+
#Formatting - new line options
20+
21+
#place catch statements on a new line
22+
csharp_new_line_before_catch = true
23+
#place else statements on a new line
24+
csharp_new_line_before_else = true
25+
#require members of object initializers to be on the same line
26+
csharp_new_line_before_members_in_object_initializers = false
27+
#require braces to be on a new line for methods, properties, accessors, types, and control_blocks (also known as "Allman" style)
28+
csharp_new_line_before_open_brace = methods, properties, accessors, types, control_blocks
29+
30+
#Formatting - organize using options
31+
32+
#sort System.* using directives alphabetically, and place them before other usings
33+
dotnet_sort_system_directives_first = true
34+
35+
#Formatting - spacing options
36+
37+
#require NO space between a cast and the value
38+
csharp_space_after_cast = false
39+
#require a space before the colon for bases or interfaces in a type declaration
40+
csharp_space_after_colon_in_inheritance_clause = true
41+
#require a space after a keyword in a control flow statement such as a for loop
42+
csharp_space_after_keywords_in_control_flow_statements = true
43+
#require a space before the colon for bases or interfaces in a type declaration
44+
csharp_space_before_colon_in_inheritance_clause = true
45+
#remove space within empty argument list parentheses
46+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
47+
#remove space between method call name and opening parenthesis
48+
csharp_space_between_method_call_name_and_opening_parenthesis = false
49+
#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
50+
csharp_space_between_method_call_parameter_list_parentheses = false
51+
#remove space within empty parameter list parentheses for a method declaration
52+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
53+
#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
54+
csharp_space_between_method_declaration_parameter_list_parentheses = false
55+
56+
#Formatting - wrapping options
57+
58+
#leave code block on single line
59+
csharp_preserve_single_line_blocks = true
60+
#leave statements and member declarations on the same line
61+
csharp_preserve_single_line_statements = true
62+
63+
#Style - Code block preferences
64+
65+
#prefer curly braces even for one line of code
66+
csharp_prefer_braces = true:suggestion
67+
68+
#Style - expression bodied member options
69+
70+
#prefer expression-bodied members for accessors
71+
csharp_style_expression_bodied_accessors = true:suggestion
72+
#prefer block bodies for constructors
73+
csharp_style_expression_bodied_constructors = false:suggestion
74+
#prefer block bodies for methods
75+
csharp_style_expression_bodied_methods = false:suggestion
76+
#prefer expression-bodied members for properties
77+
csharp_style_expression_bodied_properties = true:suggestion
78+
79+
#Style - expression level options
80+
81+
#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
82+
dotnet_style_predefined_type_for_member_access = true:suggestion
83+
84+
#Style - implicit and explicit types
85+
86+
#prefer explicit type over var in all cases, unless overridden by another code style rule
87+
csharp_style_var_elsewhere = false:suggestion
88+
#prefer explicit type over var to declare variables with built-in system types such as int
89+
csharp_style_var_for_built_in_types = false:suggestion
90+
#prefer explicit type over var when the type is already mentioned on the right-hand side of a declaration
91+
csharp_style_var_when_type_is_apparent = false:suggestion
92+
93+
#Style - language keyword and framework type options
94+
95+
#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
96+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
97+
98+
#Style - modifier options
99+
100+
#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
101+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
102+
103+
#Style - Modifier preferences
104+
105+
#when this rule is set to a list of modifiers, prefer the specified ordering.
106+
csharp_preferred_modifier_order = public,private,protected,static,extern,override,readonly,sealed:suggestion
107+
108+
#Style - qualification options
109+
110+
#prefer fields not to be prefaced with this. or Me. in Visual Basic
111+
dotnet_style_qualification_for_field = false:suggestion
112+
#prefer methods not to be prefaced with this. or Me. in Visual Basic
113+
dotnet_style_qualification_for_method = false:suggestion
114+
#prefer properties not to be prefaced with this. or Me. in Visual Basic
115+
dotnet_style_qualification_for_property = false:suggestion
116+
117+
118+
#file_header_template = Copyright (c) Keith Martin\n\nLicensed under the Apache License, Version 2.0 (the "License");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an "AS IS" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n
119+
file_header_template = <copyright file="{fileName}" company="Keith Martin">\nCopyright (c) Keith Martin\nLicensed under the Apache License, Version 2.0 (the "License")</copyright>

AndroidBotEngine.sln

+15-1
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScriptEditor", "ScriptEdito
1515
EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0FDE53F8-73A3-46B1-B8BB-C3E3FA6BCCCB}"
1717
ProjectSection(SolutionItems) = preProject
18+
.editorconfig = .editorconfig
19+
COPYRIGHT = COPYRIGHT
20+
LICENSE = LICENSE
21+
LICENSE.rtf = LICENSE.rtf
1822
README.md = README.md
1923
EndProjectSection
2024
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestBotEngineClient", "TestBotEngineClient\TestBotEngineClient.csproj", "{A655DBE3-D7BE-4372-B4CF-26E190699053}"
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBotEngineClient", "TestBotEngineClient\TestBotEngineClient.csproj", "{A655DBE3-D7BE-4372-B4CF-26E190699053}"
26+
EndProject
27+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}"
2228
EndProject
2329
Global
2430
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -101,6 +107,14 @@ Global
101107
{A655DBE3-D7BE-4372-B4CF-26E190699053}.Release|x64.Build.0 = Release|Any CPU
102108
{A655DBE3-D7BE-4372-B4CF-26E190699053}.Release|x86.ActiveCfg = Release|Any CPU
103109
{A655DBE3-D7BE-4372-B4CF-26E190699053}.Release|x86.Build.0 = Release|Any CPU
110+
{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}.Debug|Any CPU.ActiveCfg = Debug|x86
111+
{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}.Debug|x64.ActiveCfg = Debug|x86
112+
{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}.Debug|x86.ActiveCfg = Debug|x86
113+
{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}.Debug|x86.Build.0 = Debug|x86
114+
{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}.Release|Any CPU.ActiveCfg = Release|x86
115+
{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}.Release|x64.ActiveCfg = Release|x86
116+
{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}.Release|x86.ActiveCfg = Release|x86
117+
{F1C6E9CE-838C-49E6-8FC7-6A97A2EEFE4A}.Release|x86.Build.0 = Release|x86
104118
EndGlobalSection
105119
GlobalSection(SolutionProperties) = preSolution
106120
HideSolutionNode = FALSE

BotEngine/BotEngine.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<Version>0.0.1.18</Version>
99
<Authors>Keif888</Authors>
1010
<Description>Android BotEngine</Description>
11-
<AssemblyVersion>0.0.1.26</AssemblyVersion>
12-
<FileVersion>0.0.1.26</FileVersion>
11+
<AssemblyVersion>0.0.1.28</AssemblyVersion>
12+
<FileVersion>0.0.1.28</FileVersion>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

BotEngine/Program.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="Program.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Collections.Generic;
37
using System.IO;
48
using System.Text;

BotEngineClient/BOTConfig.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="BOTConfig.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Collections.Generic;
37
using System.Text;
48
using System.Text.Json.Serialization;

BotEngineClient/BotEngine.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using Microsoft.Extensions.Logging;
1+
// <copyright file="BotEngine.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using Microsoft.Extensions.Logging;
26
using SharpAdbClient;
37
using System;
48
using System.Collections.Generic;

BotEngineClient/BotEngineClient.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<Nullable>annotations</Nullable>
6-
<AssemblyVersion>1.0.0.4</AssemblyVersion>
7-
<FileVersion>1.0.0.4</FileVersion>
6+
<AssemblyVersion>1.0.0.6</AssemblyVersion>
7+
<FileVersion>1.0.0.6</FileVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>

BotEngineClient/ExtensionMethods/DoubleArrayMethods.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="DoubleArrayMethods.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Collections.Generic;
37
using System.Linq;
48

BotEngineClient/ExtensionMethods/ImageMethods.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="ImageMethods.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Drawing;
37
using System.Drawing.Drawing2D;
48
using System.Drawing.Imaging;

BotEngineClient/Helpers.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="Helpers.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26

37
namespace BotEngineClient
48
{

BotEngineClient/Histogram.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="Histogram.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Drawing;
37
using System.Linq;
48
using System.Text;

BotEngineClient/ImageInfo.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="ImageInfo.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Drawing;
37
using System.Linq;
48
using BotEngineClient.ExtensionMethods;

BotEngineClient/ImageTool.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System.Drawing;
1+
// <copyright file="ImageTool.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System.Drawing;
26
using BotEngineClient.ExtensionMethods;
37

48
// For Reference:

BotEngineClient/JsonHelper.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="JsonHelper.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Collections.Generic;
37
using System.IO;
48
using System.Text;

COPYRIGHT

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2022 Keith Martin
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

FindTextClient/CRC32.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (c) Damien Guard. All rights reserved.
2-
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
3-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
1+
// <copyright file="CRC32.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
44

55
using System;
66
using System.Collections.Generic;

FindTextClient/FindText.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="FindText.cs" company="Keith Martin, FeiYue">
2+
// Copyright (c) Keith Martin, FeiYue
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Collections.Generic;
37
using System.Diagnostics.CodeAnalysis;
48
using System.Drawing;

FindTextClient/FindTextClient.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<UseWindowsForms>true</UseWindowsForms>
66
<Nullable>annotations</Nullable>
7-
<AssemblyVersion>1.0.0.4</AssemblyVersion>
8-
<FileVersion>1.0.0.4</FileVersion>
7+
<AssemblyVersion>1.0.0.6</AssemblyVersion>
8+
<FileVersion>1.0.0.6</FileVersion>
99
</PropertyGroup>
1010

1111
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

FindTextClient/GDIFunctions.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
// <copyright file="GDIFunctions.cs" company="Keith Martin">
2+
// Copyright (c) Keith Martin
3+
// Licensed under the Apache License, Version 2.0 (the "License")</copyright>
4+
5+
using System;
26
using System.Runtime.InteropServices;
37

48
namespace FindTextClient

Installer/Installer.wixproj

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6+
<ProductVersion>3.10</ProductVersion>
7+
<ProjectGuid>f1c6e9ce-838c-49e6-8fc7-6a97a2eefe4a</ProjectGuid>
8+
<SchemaVersion>2.0</SchemaVersion>
9+
<OutputName>AndroidBotEngine</OutputName>
10+
<OutputType>Package</OutputType>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13+
<OutputPath>bin\$(Configuration)\</OutputPath>
14+
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
15+
<DefineConstants>Debug</DefineConstants>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
18+
<OutputPath>bin\$(Configuration)\</OutputPath>
19+
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
20+
</PropertyGroup>
21+
<ItemGroup>
22+
<Compile Include="Product.wxs" />
23+
</ItemGroup>
24+
<ItemGroup>
25+
<ProjectReference Include="..\BotEngine\BotEngine.csproj">
26+
<Name>BotEngine</Name>
27+
<Project>{26cc821e-14d4-46a9-8f6b-e0de17ac9978}</Project>
28+
<Private>True</Private>
29+
<DoNotHarvest>True</DoNotHarvest>
30+
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
31+
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
32+
</ProjectReference>
33+
<ProjectReference Include="..\ScriptEditor\ScriptEditor.csproj">
34+
<Name>ScriptEditor</Name>
35+
<Project>{19cb2f6c-10bf-4efb-8b84-728ba1aa1514}</Project>
36+
<Private>True</Private>
37+
<DoNotHarvest>True</DoNotHarvest>
38+
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
39+
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
40+
</ProjectReference>
41+
</ItemGroup>
42+
<ItemGroup>
43+
<WixExtension Include="WixUIExtension">
44+
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
45+
<Name>WixUIExtension</Name>
46+
</WixExtension>
47+
</ItemGroup>
48+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
49+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
50+
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
51+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
52+
</Target>
53+
<!--
54+
To modify your build process, add your task inside one of the targets below and uncomment it.
55+
Other similar extension points exist, see Wix.targets.
56+
<Target Name="BeforeBuild">
57+
</Target>
58+
<Target Name="AfterBuild">
59+
</Target>
60+
-->
61+
</Project>

0 commit comments

Comments
 (0)