Skip to content

Commit 5b8c49e

Browse files
Maximus5Maximus5
committed
Update ConEmu.Core to version 21.9.5
1 parent 0f8a73f commit 5b8c49e

File tree

9 files changed

+25
-22
lines changed

9 files changed

+25
-22
lines changed

‎ConEmuInside/ConEmuInside.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@
107107
</ItemGroup>
108108
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
109109
<PropertyGroup>
110-
<PostBuildEvent>if "$(ConfigurationName)" == "Debug" if not exist "$(TargetDir)ConEmu.xml" copy "$(SolutionDir)ConEmu.xml" "$(TargetDir)"</PostBuildEvent>
110+
<PostBuildEvent>if "$(ConfigurationName)" == "Debug" if not exist "$(TargetDir)ConEmu.xml" copy "$(SolutionDir)ConEmu.xml" "$(TargetDir)"
111+
"$(SolutionDir)Deploy\sign.cmd" "$(TargetPath)"</PostBuildEvent>
111112
</PropertyGroup>
112113
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
113114
Other similar extension points exist, see Microsoft.Common.targets.

‎ConEmuWinForms/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
[assembly : AssemblyTitle("ConEmuWinForms")]
44
[assembly : AssemblyDescription("This is a console emulator control that embeds a fully functional console view in a Windows Forms window.")]
55
[assembly : AssemblyProduct("ConEmu")]
6-
[assembly : AssemblyCopyright("Copyright © hypersw, Maximus5, 2015–2016")]
6+
[assembly : AssemblyCopyright("Copyright © hypersw, Maximus5, 2015–2021")]
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("1.20.10.11")]
11-
[assembly : AssemblyFileVersion("1.20.10.11")]
10+
[assembly : AssemblyVersion("1.21.9.5")]
11+
[assembly : AssemblyFileVersion("1.21.9.5")]

‎ConEmuWinForms/ConEmuWinForms.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,14 @@
9595
</ItemGroup>
9696
<ItemGroup />
9797
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
98-
<Import Project="..\packages\ConEmu.Core.20.10.11\build\ConEmu.Core.Targets" Condition="Exists('..\packages\ConEmu.Core.20.10.11\build\ConEmu.Core.Targets')" />
98+
<Import Project="..\packages\ConEmu.Core.21.9.5\Build\ConEmu.Core.Targets" Condition="Exists('..\packages\ConEmu.Core.21.9.5\Build\ConEmu.Core.Targets')" />
9999
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
100100
<PropertyGroup>
101101
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
102102
</PropertyGroup>
103-
<Error Condition="!Exists('..\packages\ConEmu.Core.20.10.11\build\ConEmu.Core.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConEmu.Core.20.10.11\build\ConEmu.Core.Targets'))" />
103+
<Error Condition="!Exists('..\packages\ConEmu.Core.21.9.5\Build\ConEmu.Core.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConEmu.Core.21.9.5\Build\ConEmu.Core.Targets'))" />
104104
</Target>
105+
<PropertyGroup>
106+
<PostBuildEvent>"$(SolutionDir)Deploy\sign.cmd" "$(TargetPath)"</PostBuildEvent>
107+
</PropertyGroup>
105108
</Project>

‎ConEmuWinForms/Package.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>ConEmu.Control.WinForms</id>
55
<!-- 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>
6+
<version>1.21.9.5</version>
77
<title>ConEmu Console Emulator — Windows Forms Control Embedding</title>
88
<authors>Maximus5,hypersw</authors>
99
<owners>Maximus5,hypersw</owners>
@@ -12,7 +12,7 @@
1212
<icon>images\icon.png</icon>
1313
<releaseNotes>https://conemu.github.io/en/Whats_New.html</releaseNotes>
1414

15-
<copyright>© 2020, Maksim Moisiuk</copyright>
15+
<copyright>© 2021, Maksim Moisiuk</copyright>
1616
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1717
<license type="file">license\license.txt</license>
1818

@@ -28,7 +28,7 @@
2828

2929
<dependencies>
3030
<group targetFramework=".NETFramework4.0">
31-
<dependency id="ConEmu.Core" version="[20.10.11,)" />
31+
<dependency id="ConEmu.Core" version="[21.9.5,)" />
3232
</group>
3333
</dependencies>
3434
</metadata>
@@ -38,4 +38,4 @@
3838
<file src="package\icon.png" target="images\icon.png" />
3939
<file src="package\license.txt" target="license\license.txt" />
4040
</files>
41-
</package>
41+
</package>

‎ConEmuWinForms/package/license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ConEmu-Maximus5 - Handy Windows terminal
22
Copyright (c) 2006-2008, Zoin <[email protected]>
3-
Copyright (c) 2009-2020, Maksim Moisiuk <[email protected]>
3+
Copyright (c) 2009-2021, Maksim Moisiuk <[email protected]>
44

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

‎ConEmuWinForms/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ConEmu.Core" version="20.10.11" targetFramework="net40-client" />
3+
<package id="ConEmu.Core" version="21.9.5" targetFramework="net40-client" />
44
</packages>

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
This is an example, how [ConEmu-Maximus5](https://conemu.github.io)
33
may be embedded into third-party graphical applications.
44

5-
ConEmu build 151201 or higher is required.
5+
ConEmu build 210905 or higher is required.
66

77

88
## Screenshots
@@ -25,7 +25,7 @@ Solution `ConEmuInside.sln` contains several projects.
2525
## License (BSD 3-clause)
2626

2727
Copyright (c) 2020, Maksim Moisiuk <[email protected]>
28-
28+
2929
Redistribution and use in source and binary forms, with or without
3030
modification, are permitted provided that the following conditions
3131
are met:
@@ -36,7 +36,7 @@ Solution `ConEmuInside.sln` contains several projects.
3636
documentation and/or other materials provided with the distribution.
3737
3. The name of the authors may not be used to endorse or promote products
3838
derived from this software without specific prior written permission.
39-
39+
4040
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
4141
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
4242
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

‎Samples/ConsoleUtilityShowcase/ConsoleUtilityShowcase.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@
4040
<ItemGroup>
4141
<Compile Include="Program.cs" />
4242
</ItemGroup>
43-
<ItemGroup>
44-
<None Include="packages.config" />
45-
</ItemGroup>
4643
<ItemGroup>
4744
<ProjectReference Include="..\..\ConEmuWinForms\ConEmuWinForms.csproj">
4845
<Project>{1dc7d403-484b-43b4-b017-1356397a32cb}</Project>
4946
<Name>ConEmuWinForms</Name>
5047
</ProjectReference>
5148
</ItemGroup>
49+
<ItemGroup>
50+
<None Include="packages.config" />
51+
</ItemGroup>
5252
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
53-
<Import Project="..\..\packages\ConEmu.Core.16.4.3.1\build\ConEmu.Core.Targets" Condition="Exists('..\..\packages\ConEmu.Core.16.4.3.1\build\ConEmu.Core.Targets')" />
53+
<Import Project="..\..\packages\ConEmu.Core.21.9.5\build\ConEmu.Core.Targets" Condition="Exists('..\..\packages\ConEmu.Core.21.9.5\build\ConEmu.Core.Targets')" />
5454
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
5555
<PropertyGroup>
5656
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
5757
</PropertyGroup>
58-
<Error Condition="!Exists('..\..\packages\ConEmu.Core.16.4.3.1\build\ConEmu.Core.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ConEmu.Core.16.4.3.1\build\ConEmu.Core.Targets'))" />
58+
<Error Condition="!Exists('..\..\packages\ConEmu.Core.21.9.5\build\ConEmu.Core.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ConEmu.Core.21.9.5\build\ConEmu.Core.Targets'))" />
5959
</Target>
6060
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6161
Other similar extension points exist, see Microsoft.Common.targets.

‎Samples/ConsoleUtilityShowcase/packages.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<!--package id="ConEmu.Control.WinForms" version="1.0.20160313.1" targetFramework="net45" /-->
4-
<package id="ConEmu.Core" version="16.4.3.1" targetFramework="net45" />
3+
<package id="ConEmu.Core" version="21.9.5" targetFramework="net45" />
54
</packages>

0 commit comments

Comments
 (0)