Skip to content

Commit 32d483f

Browse files
author
Maksim Moisiuk
committed
Update NuGet and build scripts
1 parent 06a8425 commit 32d483f

File tree

14 files changed

+252
-97
lines changed

14 files changed

+252
-97
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ obj
99

1010
ConEmu.CommandLine/Tools/ConEmu/*
1111
*.nupkg
12-
nuget/data
1312
packages/**
1413
*.opendb

‎ConEmuInside.sln

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30406.217
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConEmuInside", "ConEmuInside\ConEmuInside.csproj", "{44D33E8F-7F78-417D-AA78-E42AEE2071E3}"
77
EndProject
@@ -11,21 +11,38 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleUtilityShowcase", "S
1111
EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlDllTestbed", "Tests\ControlDllTestbed\ControlDllTestbed.csproj", "{FEE30B4B-149C-4878-9C62-8ADEF4C8A6C1}"
1313
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6E427565-9D1D-4D62-81B1-202DA95D7CDA}"
15+
ProjectSection(SolutionItems) = preProject
16+
README.md = README.md
17+
EndProjectSection
18+
EndProject
1419
Global
1520
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16-
Default|Any CPU = Default|Any CPU
21+
Debug|Any CPU = Debug|Any CPU
22+
Release|Any CPU = Release|Any CPU
1723
EndGlobalSection
1824
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19-
{44D33E8F-7F78-417D-AA78-E42AEE2071E3}.Default|Any CPU.ActiveCfg = Debug|Any CPU
20-
{44D33E8F-7F78-417D-AA78-E42AEE2071E3}.Default|Any CPU.Build.0 = Debug|Any CPU
21-
{1DC7D403-484B-43B4-B017-1356397A32CB}.Default|Any CPU.ActiveCfg = Default|Any CPU
22-
{1DC7D403-484B-43B4-B017-1356397A32CB}.Default|Any CPU.Build.0 = Default|Any CPU
23-
{ECD0914D-ABAE-468A-9265-10E6DFF6EB80}.Default|Any CPU.ActiveCfg = Default|Any CPU
24-
{ECD0914D-ABAE-468A-9265-10E6DFF6EB80}.Default|Any CPU.Build.0 = Default|Any CPU
25-
{FEE30B4B-149C-4878-9C62-8ADEF4C8A6C1}.Default|Any CPU.ActiveCfg = Default|Any CPU
26-
{FEE30B4B-149C-4878-9C62-8ADEF4C8A6C1}.Default|Any CPU.Build.0 = Default|Any CPU
25+
{44D33E8F-7F78-417D-AA78-E42AEE2071E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{44D33E8F-7F78-417D-AA78-E42AEE2071E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{44D33E8F-7F78-417D-AA78-E42AEE2071E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
28+
{44D33E8F-7F78-417D-AA78-E42AEE2071E3}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{1DC7D403-484B-43B4-B017-1356397A32CB}.Debug|Any CPU.ActiveCfg = Default|Any CPU
30+
{1DC7D403-484B-43B4-B017-1356397A32CB}.Debug|Any CPU.Build.0 = Default|Any CPU
31+
{1DC7D403-484B-43B4-B017-1356397A32CB}.Release|Any CPU.ActiveCfg = Default|Any CPU
32+
{1DC7D403-484B-43B4-B017-1356397A32CB}.Release|Any CPU.Build.0 = Default|Any CPU
33+
{ECD0914D-ABAE-468A-9265-10E6DFF6EB80}.Debug|Any CPU.ActiveCfg = Default|Any CPU
34+
{ECD0914D-ABAE-468A-9265-10E6DFF6EB80}.Debug|Any CPU.Build.0 = Default|Any CPU
35+
{ECD0914D-ABAE-468A-9265-10E6DFF6EB80}.Release|Any CPU.ActiveCfg = Default|Any CPU
36+
{ECD0914D-ABAE-468A-9265-10E6DFF6EB80}.Release|Any CPU.Build.0 = Default|Any CPU
37+
{FEE30B4B-149C-4878-9C62-8ADEF4C8A6C1}.Debug|Any CPU.ActiveCfg = Default|Any CPU
38+
{FEE30B4B-149C-4878-9C62-8ADEF4C8A6C1}.Debug|Any CPU.Build.0 = Default|Any CPU
39+
{FEE30B4B-149C-4878-9C62-8ADEF4C8A6C1}.Release|Any CPU.ActiveCfg = Default|Any CPU
40+
{FEE30B4B-149C-4878-9C62-8ADEF4C8A6C1}.Release|Any CPU.Build.0 = Default|Any CPU
2741
EndGlobalSection
2842
GlobalSection(SolutionProperties) = preSolution
2943
HideSolutionNode = FALSE
3044
EndGlobalSection
45+
GlobalSection(ExtensibilityGlobals) = postSolution
46+
SolutionGuid = {276FC0EF-9EF3-44A9-8FDF-B195E76EA89C}
47+
EndGlobalSection
3148
EndGlobal

‎ConEmuInside.sln.DotSettings

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
22
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
33
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
4-
<s:Boolean x:Key="/Default/UserDictionary/Words/=conemu/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
4+
<s:Boolean x:Key="/Default/UserDictionary/Words/=conemu/@EntryIndexedValue">True</s:Boolean>
5+
<s:Boolean x:Key="/Default/UserDictionary/Words/=hypersw/@EntryIndexedValue">True</s:Boolean>
6+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Maximus/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎ConEmuInside/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.2.0.0")]
36-
[assembly: AssemblyFileVersion("0.2.0.0")]
35+
[assembly: AssemblyVersion("0.3.0.0")]
36+
[assembly: AssemblyFileVersion("0.3.0.0")]

‎ConEmuWinForms/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77

88
// These versions must remain 1.0 as soon as API is considered compatible, this will allow the compiled code to be compatible with minor updates
99
// Do not use the nuget version here
10-
[assembly : AssemblyVersion("20.10.11.0")]
11-
[assembly : AssemblyFileVersion("20.10.11.0")]
10+
[assembly : AssemblyVersion("1.20.10.11")]
11+
[assembly : AssemblyFileVersion("1.20.10.11")]

‎ConEmuWinForms/ConEmuWinForms.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@
7474
</ItemGroup>
7575
<ItemGroup>
7676
<Content Include="ConEmu.xml" />
77+
<Content Include="package\icon.png">
78+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
79+
</Content>
80+
<Content Include="package\license.txt">
81+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
82+
</Content>
7783
<None Include="Package.nuspec">
7884
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7985
</None>
@@ -87,6 +93,7 @@
8793
<SubType>Designer</SubType>
8894
</EmbeddedResource>
8995
</ItemGroup>
96+
<ItemGroup />
9097
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9198
<Import Project="..\packages\ConEmu.Core.20.10.11\build\ConEmu.Core.Targets" Condition="Exists('..\packages\ConEmu.Core.20.10.11\build\ConEmu.Core.Targets')" />
9299
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎ConEmuWinForms/Package.nuspec

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3-
<metadata>
4-
<id>ConEmu.Control.WinForms</id>
5-
<version>1.0.20160518.0</version> <!-- 1.0, because Nuget only upgrades automatically with the same first components, so probably shan't keep the date in them. -->
6-
<title>ConEmu Console Emulator — Windows Forms Control Embedding</title>
7-
<authors>Maximus5,hypersw</authors>
8-
<owners>Maximus5,hypersw</owners>
9-
<projectUrl>http://conemu.github.io/</projectUrl>
10-
<iconUrl>http://conemu.github.io/img/logo.png</iconUrl>
11-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12-
<summary>This is a console emulator control that embeds a fully functional console view in a Windows Forms window.</summary>
13-
<description>This is a console emulator control that embeds a fully functional console view in a Windows Forms window. It is capable of running any console application with full interactivity and advanced console functions. Applications will detect it as an actual console and will not fall back to the output redirection mode with reduced interactivity or formatting.</description>
14-
<licenseUrl>https://opensource.org/licenses/BSD-3-Clause</licenseUrl>
15-
<dependencies>
16-
<dependency id="ConEmu.Core" version="[16.03.10,)" />
17-
</dependencies>
18-
</metadata>
19-
<files>
20-
<file src="ConEmu.WinForms.dll" target="lib/net40"/>
21-
<file src="ConEmu.WinForms.Xml" target="lib/net40"/>
22-
</files>
3+
<metadata>
4+
<id>ConEmu.Control.WinForms</id>
5+
<!-- 1.0, because Nuget only upgrades automatically with the same first components, so probably shan't keep the date in them. -->
6+
<version>1.20.10.11</version>
7+
<title>ConEmu Console Emulator — Windows Forms Control Embedding</title>
8+
<authors>Maximus5,hypersw</authors>
9+
<owners>Maximus5,hypersw</owners>
10+
11+
<projectUrl>https://conemu.github.io/</projectUrl>
12+
<icon>images\icon.png</icon>
13+
<releaseNotes>https://conemu.github.io/en/Whats_New.html</releaseNotes>
14+
15+
<copyright>© 2020, Maksim Moisiuk</copyright>
16+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
17+
<license type="file">license\license.txt</license>
18+
19+
<summary>
20+
This is a console emulator control that embeds a fully functional console view in a Windows Forms window.
21+
</summary>
22+
<description>
23+
This is a console emulator control that embeds a fully functional console view in a Windows Forms window.
24+
It is capable of running any console application with full interactivity and advanced console functions.
25+
Applications will detect it as an actual console and will not fall back to the output redirection mode with
26+
reduced interactivity or formatting.
27+
</description>
28+
29+
<dependencies>
30+
<group targetFramework=".NETFramework4.0">
31+
<dependency id="ConEmu.Core" version="[20.10.11,)" />
32+
</group>
33+
</dependencies>
34+
</metadata>
35+
<files>
36+
<file src="ConEmu.WinForms.dll" target="lib/net40"/>
37+
<file src="ConEmu.WinForms.Xml" target="lib/net40"/>
38+
<file src="package\icon.png" target="images\icon.png" />
39+
<file src="package\license.txt" target="license\license.txt" />
40+
</files>
2341
</package>

‎ConEmuWinForms/package/icon.png

4.1 KB
Loading

‎ConEmuWinForms/package/license.txt

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
ConEmu-Maximus5 - Handy Windows terminal
2+
Copyright (c) 2006-2008, Zoin <[email protected]>
3+
Copyright (c) 2009-2020, Maksim Moisiuk <[email protected]>
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
1. Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
2. Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
3. The name of the authors may not be used to endorse or promote products
14+
derived from this software without specific prior written permission.
15+
16+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
17+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19+
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21+
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25+
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26+
27+
-------------------------------------------------------------------------------
28+
MinHook - The Minimalistic API Hooking Library for x64/x86
29+
Copyright (C) 2009-2015 Tsuda Kageyu.
30+
All rights reserved.
31+
32+
Redistribution and use in source and binary forms, with or without
33+
modification, are permitted provided that the following conditions
34+
are met:
35+
36+
1. Redistributions of source code must retain the above copyright
37+
notice, this list of conditions and the following disclaimer.
38+
2. Redistributions in binary form must reproduce the above copyright
39+
notice, this list of conditions and the following disclaimer in the
40+
documentation and/or other materials provided with the distribution.
41+
42+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
43+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
44+
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
45+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
46+
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
47+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
48+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
49+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
50+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
51+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
52+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
53+
54+
-------------------------------------------------------------------------------
55+
Hacker Disassembler Engine 32 C
56+
Copyright (c) 2008-2009, Vyacheslav Patkov.
57+
All rights reserved.
58+
59+
Redistribution and use in source and binary forms, with or without
60+
modification, are permitted provided that the following conditions
61+
are met:
62+
63+
1. Redistributions of source code must retain the above copyright
64+
notice, this list of conditions and the following disclaimer.
65+
2. Redistributions in binary form must reproduce the above copyright
66+
notice, this list of conditions and the following disclaimer in the
67+
documentation and/or other materials provided with the distribution.
68+
69+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
70+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
71+
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
72+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
73+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
74+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
75+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
76+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
77+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
78+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
79+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
80+
81+
-------------------------------------------------------------------------------
82+
Hacker Disassembler Engine 64 C
83+
Copyright (c) 2008-2009, Vyacheslav Patkov.
84+
All rights reserved.
85+
86+
Redistribution and use in source and binary forms, with or without
87+
modification, are permitted provided that the following conditions
88+
are met:
89+
90+
1. Redistributions of source code must retain the above copyright
91+
notice, this list of conditions and the following disclaimer.
92+
2. Redistributions in binary form must reproduce the above copyright
93+
notice, this list of conditions and the following disclaimer in the
94+
documentation and/or other materials provided with the distribution.
95+
96+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
97+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
98+
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
99+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
100+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
101+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
102+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
103+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
104+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
105+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
106+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
107+
108+
-------------------------------------------------------------------------------
109+
json-parser
110+
Copyright (C) 2012, 2013 James McLaughlin et al. All rights reserved.
111+
112+
Redistribution and use in source and binary forms, with or without
113+
modification, are permitted provided that the following conditions
114+
are met:
115+
116+
1. Redistributions of source code must retain the above copyright
117+
notice, this list of conditions and the following disclaimer.
118+
119+
2. Redistributions in binary form must reproduce the above copyright
120+
notice, this list of conditions and the following disclaimer in the
121+
documentation and/or other materials provided with the distribution.
122+
123+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
124+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
125+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
126+
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
127+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
128+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
129+
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
130+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
131+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
132+
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
133+
SUCH DAMAGE.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Solution `ConEmuInside.sln` contains several projects.
2424

2525
## License (BSD 3-clause)
2626

27-
Copyright (c) 2015, Maximus5 <[email protected]>
27+
Copyright (c) 2020, Maksim Moisiuk <[email protected]>
2828

2929
Redistribution and use in source and binary forms, with or without
3030
modification, are permitted provided that the following conditions

0 commit comments

Comments
 (0)