Skip to content

Commit dd199b7

Browse files
p0358p0358
committed
bump version
1 parent 815f851 commit dd199b7

5 files changed

Lines changed: 34 additions & 54 deletions

File tree

‎CodeStats.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeStatsUpdater", "CodeSta
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|Any CPU = Debug|Any CPU
12+
Debug|x86 = Debug|x86
1313
Debug|x64 = Debug|x64
14-
Release|Any CPU = Release|Any CPU
14+
Release|x86 = Release|x86
1515
Release|x64 = Release|x64
1616
EndGlobalSection
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19-
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Debug|x86.ActiveCfg = Debug|x86
19+
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Debug|x86.Build.0 = Debug|x86
2020
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Debug|x64.ActiveCfg = Debug|x64
2121
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Debug|x64.Build.0 = Debug|x64
22-
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|x86.ActiveCfg = Release|x86
23+
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|x86.Build.0 = Release|x86
2424
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|x64.ActiveCfg = Release|x64
2525
{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|x64.Build.0 = Release|x64
26-
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|x64.ActiveCfg = Debug|Any CPU
29-
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|x64.Build.0 = Debug|Any CPU
30-
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|x64.ActiveCfg = Release|Any CPU
33-
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|x64.Build.0 = Release|Any CPU
26+
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|x86.ActiveCfg = Debug|x86
27+
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|x86.Build.0 = Debug|x86
28+
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|x64.ActiveCfg = Debug|x86
29+
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|x64.Build.0 = Debug|x86
30+
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|x86.ActiveCfg = Release|x86
31+
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|x86.Build.0 = Release|x86
32+
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|x64.ActiveCfg = Release|x86
33+
{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|x64.Build.0 = Release|x86
3434
EndGlobalSection
3535
GlobalSection(SolutionProperties) = preSolution
3636
HideSolutionNode = FALSE

‎CodeStats/CodeStats.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
<OldToolsVersion>3.5</OldToolsVersion>
1919
<TargetFrameworkProfile />
2020
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
2222
<DebugSymbols>true</DebugSymbols>
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<DebugType>full</DebugType>
2525
<ErrorReport>prompt</ErrorReport>
2626
<Optimize>false</Optimize>
27-
<OutputPath>bin\Debug</OutputPath>
27+
<OutputPath>bin\x86\Debug</OutputPath>
2828
<PlatformTarget>x86</PlatformTarget>
2929
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3030
<Prefer32Bit>false</Prefer32Bit>
3131
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
32+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
3333
<DefineConstants>TRACE</DefineConstants>
3434
<Optimize>true</Optimize>
35-
<OutputPath>bin\Release</OutputPath>
35+
<OutputPath>bin\x86\Release</OutputPath>
3636
<DebugType>pdbonly</DebugType>
3737
<ErrorReport>prompt</ErrorReport>
3838
<PlatformTarget>x86</PlatformTarget>

‎CodeStats/CodeStatsPackage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ internal static void PluginCleanUp()
976976
}
977977
}
978978

979-
Logger.Info("Plugin cleanup finished");
979+
Logger.Info("Plugin cleanup on shutdown finished");
980980
Logger.FlushEverything();
981981
}
982982
catch (Exception ex)

‎CodeStats/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("p0358")]
1111
[assembly: AssemblyProduct("Code::Stats")]
12-
[assembly: AssemblyCopyright("Copyright © p0358 2017-2019")]
12+
[assembly: AssemblyCopyright("Copyright © p0358 2017-2022")]
1313
[assembly: AssemblyTrademark("Code::Stats")]
1414
[assembly: AssemblyCulture("")]
1515

@@ -36,5 +36,5 @@
3636
// separating this is convenient, because it allows you to update the real values here without triggering the update notification before it's ready
3737
// [assembly: AssemblyFileVersion("1.0.1")]
3838

39-
[assembly: AssemblyVersion("1.0.1")]
40-
[assembly: AssemblyFileVersion("1.0.1")]
39+
[assembly: AssemblyVersion("1.1.0")]
40+
[assembly: AssemblyFileVersion("1.1.0")]

‎appveyor.yml‎

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,40 @@
1-
version: 1.0.1.{build}
1+
version: 1.1.0.{build}
22
image: Visual Studio 2017
33

4-
5-
environment:
6-
matrix:
7-
- PlatformToolset: VS15
8-
- PlatformToolset: VS17
9-
104
platform:
115
- x64
12-
- Any CPU
6+
- x86
137

148
configuration:
159
- Release
1610
- Debug
1711

1812
install:
1913
- if "%platform%"=="x64" set archi=amd64
20-
- if "%platform%"=="x64" set platform_input=x64
21-
22-
- if "%platform%"=="Any CPU" set archi=x86
23-
- if "%platform%"=="Any CPU" set platform_input=Any CPU
24-
25-
- if "%PlatformToolset%"=="VS15" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
26-
- if "%PlatformToolset%"=="VS17" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
27-
14+
- if "%platform%"=="x86" set archi=x86
2815

2916
build_script:
3017
- cd "%APPVEYOR_BUILD_FOLDER%"
31-
- msbuild CodeStats.sln /m /p:configuration="%configuration%" /p:platform="%platform_input%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
18+
- msbuild CodeStats.sln /m /p:configuration="%configuration%" /p:platform="%platform%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
3219

3320
after_build:
3421
- cd "%APPVEYOR_BUILD_FOLDER%"\CodeStats
3522
- ps: >-
3623
37-
if ($env:PLATFORM_INPUT -eq "x64" -and $env:CONFIGURATION -eq "Release") {
24+
if ($env:PLATFORM -eq "x64" -and $env:CONFIGURATION -eq "Release") {
3825
Push-AppveyorArtifact "bin\x64\$env:CONFIGURATION\CodeStats.dll" -FileName CodeStats.dll
3926
}
4027
41-
if ($env:PLATFORM_INPUT -eq "Any CPU" -and $env:CONFIGURATION -eq "Release") {
28+
if ($env:PLATFORM -eq "x86" -and $env:CONFIGURATION -eq "Release") {
4229
Push-AppveyorArtifact "bin\$env:CONFIGURATION\CodeStats.dll" -FileName CodeStats.dll
4330
}
4431
45-
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "VS17") {
46-
if($env:PLATFORM_INPUT -eq "x64"){
47-
$ZipFileName = "notepadpp-CodeStats_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
48-
Remove-Item bin\x64\$env:CONFIGURATION\*.exp
49-
Remove-Item bin\x64\$env:CONFIGURATION\*.lib
50-
7z a $ZipFileName bin\x64\$env:CONFIGURATION\*
51-
}
52-
if($env:PLATFORM_INPUT -eq "Any CPU"){
53-
$ZipFileName = "notepadpp-CodeStats_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
54-
Remove-Item bin\$env:CONFIGURATION\*.exp
55-
Remove-Item bin\$env:CONFIGURATION\*.lib
56-
7z a $ZipFileName bin\$env:CONFIGURATION\*
32+
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release") {
33+
if ($env:PLATFORM -eq "x64" -or $env:PLATFORM -eq "x86") {
34+
$ZipFileName = "notepadpp-CodeStats_$($env:APPVEYOR_REPO_TAG_NAME)_$($env:PLATFORM).zip"
35+
Remove-Item bin\$env:PLATFORM\$env:CONFIGURATION\*.exp
36+
Remove-Item bin\$env:PLATFORM\$env:CONFIGURATION\*.lib
37+
7z a $ZipFileName bin\$env:PLATFORM\$env:CONFIGURATION\*
5738
}
5839
}
5940
@@ -71,5 +52,4 @@ deploy:
7152
force_update: true
7253
on:
7354
appveyor_repo_tag: true
74-
PlatformToolset: VS17
7555
configuration: Release

0 commit comments

Comments
 (0)