Skip to content

Commit ef9d67a

Browse files
dlebansaisdlebansais
committed
Added Travis.
1 parent ea41438 commit ef9d67a

File tree

10 files changed

+92
-22
lines changed

10 files changed

+92
-22
lines changed

‎.travis.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
language: csharp
2+
solution: Kill-Update.sln
3+
4+
install:
5+
- nuget restore Kill-Update.sln
6+
7+
script:
8+
- msbuild /p:Configuration=Travis Kill-Update.sln
9+
10+
deploy:
11+
provider: pages
12+
skip_cleanup: true
13+
github_token: $GITHUB_TOKEN
14+
local_dir: ./Kill-Update/bin/x64/Travis
15+
target_branch: gh-pages
16+
email: "[email protected]"
17+
on:
18+
branch: master

‎Kill-Update-Plugin/Kill-Update-Plugin.csproj

+16-4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
<ErrorReport>prompt</ErrorReport>
3333
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
3434
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Travis|x64'">
36+
<OutputPath>bin\x64\Travis\</OutputPath>
37+
<DefineConstants>TRACE</DefineConstants>
38+
<Optimize>true</Optimize>
39+
<PlatformTarget>x64</PlatformTarget>
40+
<ErrorReport>prompt</ErrorReport>
41+
</PropertyGroup>
3542
<ItemGroup>
3643
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
3744
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
@@ -74,13 +81,18 @@
7481
<None Include="packages.config" />
7582
</ItemGroup>
7683
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
77-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
78-
<PostBuildEvent>if exist "$(SolutionDir)signfile.bat" call "$(SolutionDir)signfile.bat" "$(SolutionDir)" "$(Configuration)-$(Platform)" "$(TargetPath)"</PostBuildEvent>
79-
<OutputPath>bin\x64\Release\</OutputPath>
80-
</PropertyGroup>
8184
<PropertyGroup>
8285
<PreBuildEvent>call "$(SolutionDir)updateversion.bat" "$(SolutionDir)" "$(SolutionPath)" "$(SolutionDir)SinglePluginHost\SinglePluginHost.csproj"</PreBuildEvent>
8386
</PropertyGroup>
87+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
88+
<PostBuildEvent>call "$(SolutionDir)updatecommit.bat" "$(SolutionDir)" "$(TargetPath)"</PostBuildEvent>
89+
<OutputPath>bin\x64\Release\</OutputPath>
90+
</PropertyGroup>
91+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
92+
<PostBuildEvent>call "$(SolutionDir)updatecommit.bat" "$(SolutionDir)" "$(TargetPath)"
93+
if exist "$(SolutionDir)signfile.bat" call "$(SolutionDir)signfile.bat" "$(SolutionDir)" "$(Configuration)-$(Platform)" "$(TargetPath)"</PostBuildEvent>
94+
<OutputPath>bin\x64\Release\</OutputPath>
95+
</PropertyGroup>
8496
<Import Project="..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.3\build\Fody.targets')" />
8597
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8698
<PropertyGroup>

‎Kill-Update-Plugin/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
// You can specify all the values or you can default the Build and Revision Numbers
3131
// by using the '*' as shown below:
3232
// [assembly: AssemblyVersion("1.0.*")]
33-
[assembly: AssemblyVersion("1.0.0.80")]
34-
[assembly: AssemblyFileVersion("1.0.0.60")]
33+
[assembly: AssemblyVersion("1.0.0.86")]
34+
[assembly: AssemblyFileVersion("1.0.0.62")]
3535
[assembly: NeutralResourcesLanguage("en-US")]
3636

‎Kill-Update.sln

+7
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,27 @@ Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1414
Debug|x64 = Debug|x64
1515
Release|x64 = Release|x64
16+
Travis|x64 = Travis|x64
1617
EndGlobalSection
1718
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1819
{82665A13-754F-4EA3-ABA7-0561AB862F20}.Debug|x64.ActiveCfg = Debug|x64
1920
{82665A13-754F-4EA3-ABA7-0561AB862F20}.Debug|x64.Build.0 = Debug|x64
2021
{82665A13-754F-4EA3-ABA7-0561AB862F20}.Release|x64.ActiveCfg = Release|x64
2122
{82665A13-754F-4EA3-ABA7-0561AB862F20}.Release|x64.Build.0 = Release|x64
23+
{82665A13-754F-4EA3-ABA7-0561AB862F20}.Travis|x64.ActiveCfg = Travis|x64
24+
{82665A13-754F-4EA3-ABA7-0561AB862F20}.Travis|x64.Build.0 = Travis|x64
2225
{3F3A2AF4-A095-4715-B807-AAA8B1089AD7}.Debug|x64.ActiveCfg = Debug|x64
2326
{3F3A2AF4-A095-4715-B807-AAA8B1089AD7}.Debug|x64.Build.0 = Debug|x64
2427
{3F3A2AF4-A095-4715-B807-AAA8B1089AD7}.Release|x64.ActiveCfg = Release|x64
2528
{3F3A2AF4-A095-4715-B807-AAA8B1089AD7}.Release|x64.Build.0 = Release|x64
29+
{3F3A2AF4-A095-4715-B807-AAA8B1089AD7}.Travis|x64.ActiveCfg = Travis|x64
30+
{3F3A2AF4-A095-4715-B807-AAA8B1089AD7}.Travis|x64.Build.0 = Travis|x64
2631
{1AA662FD-9DDE-4638-B2B5-2367268B5B96}.Debug|x64.ActiveCfg = Debug|x64
2732
{1AA662FD-9DDE-4638-B2B5-2367268B5B96}.Debug|x64.Build.0 = Debug|x64
2833
{1AA662FD-9DDE-4638-B2B5-2367268B5B96}.Release|x64.ActiveCfg = Release|x64
2934
{1AA662FD-9DDE-4638-B2B5-2367268B5B96}.Release|x64.Build.0 = Release|x64
35+
{1AA662FD-9DDE-4638-B2B5-2367268B5B96}.Travis|x64.ActiveCfg = Travis|x64
36+
{1AA662FD-9DDE-4638-B2B5-2367268B5B96}.Travis|x64.Build.0 = Travis|x64
3037
EndGlobalSection
3138
GlobalSection(SolutionProperties) = preSolution
3239
HideSolutionNode = FALSE

‎Kill-Update/App.xaml.cs

+8-2
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,18 @@ private void OnMenuOpening(object sender, EventArgs e)
393393
#endregion
394394

395395
#region Zombification
396+
private static bool IsRestart { get { return Zombification.IsRestart; } }
397+
396398
private void InitZombification()
397399
{
398400
App.AddLog("InitZombification starting");
399401

402+
if (IsRestart)
403+
App.AddLog("This process has been restarted");
404+
400405
Zombification = new Zombification("Kill-Update");
401406
Zombification.Delay = TimeSpan.FromMinutes(1);
407+
Zombification.Flags = Flags.NoWindow | Flags.ForwardArguments;
402408
Zombification.ZombifyMe();
403409

404410
App.AddLog("InitZombification done");
@@ -465,6 +471,8 @@ private void OnExit(object sender, ExitEventArgs e)
465471
{
466472
App.AddLog("Exiting application");
467473

474+
ExitZombification();
475+
468476
StopServiceManager();
469477

470478
if (InstanceEvent != null)
@@ -478,8 +486,6 @@ private void OnExit(object sender, ExitEventArgs e)
478486
TaskbarIcon = null;
479487
}
480488

481-
ExitZombification();
482-
483489
App.AddLog("Done");
484490
}
485491
#endregion

‎Kill-Update/Kill-Update.csproj

+14-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<PlatformTarget>x64</PlatformTarget>
2525
<ErrorReport>prompt</ErrorReport>
2626
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
27-
<Prefer32Bit>true</Prefer32Bit>
2827
</PropertyGroup>
2928
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
3029
<OutputPath>bin\x64\Release\</OutputPath>
@@ -34,7 +33,13 @@
3433
<PlatformTarget>x64</PlatformTarget>
3534
<ErrorReport>prompt</ErrorReport>
3635
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
37-
<Prefer32Bit>true</Prefer32Bit>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Travis|x64'">
38+
<OutputPath>bin\x64\Travis\</OutputPath>
39+
<DefineConstants>TRACE</DefineConstants>
40+
<Optimize>true</Optimize>
41+
<PlatformTarget>x64</PlatformTarget>
42+
<ErrorReport>prompt</ErrorReport>
3843
</PropertyGroup>
3944
<PropertyGroup>
4045
<ApplicationIcon>Resources\main.ico</ApplicationIcon>
@@ -121,12 +126,16 @@
121126
<EmbeddedResource Include="Resources\Unlocked-Enabled.ico" />
122127
</ItemGroup>
123128
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
124-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
125-
<PostBuildEvent>if exist "$(SolutionDir)signfile.bat" call "$(SolutionDir)signfile.bat" "$(SolutionDir)" "$(Configuration)-$(Platform)" "$(TargetPath)"</PostBuildEvent>
126-
</PropertyGroup>
127129
<PropertyGroup>
128130
<PreBuildEvent>call "$(SolutionDir)updateversion.bat" "$(SolutionDir)" "$(SolutionPath)"</PreBuildEvent>
129131
</PropertyGroup>
132+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
133+
<PostBuildEvent>call "$(SolutionDir)updatecommit.bat" "$(SolutionDir)" "$(TargetPath)"</PostBuildEvent>
134+
</PropertyGroup>
135+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
136+
<PostBuildEvent>call "$(SolutionDir)updatecommit.bat" "$(SolutionDir)" "$(TargetPath)"
137+
if exist "$(SolutionDir)signfile.bat" call "$(SolutionDir)signfile.bat" "$(SolutionDir)" "$(Configuration)-$(Platform)" "$(TargetPath)"</PostBuildEvent>
138+
</PropertyGroup>
130139
<Import Project="..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.3\build\Fody.targets')" />
131140
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
132141
<PropertyGroup>

‎Kill-Update/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.0.80")]
55-
[assembly: AssemblyFileVersion("1.0.0.43")]
54+
[assembly: AssemblyVersion("1.0.0.86")]
55+
[assembly: AssemblyFileVersion("1.0.0.49")]
5656
[assembly: NeutralResourcesLanguage("en-US")]
5757

‎SinglePluginHost/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.0.80")]
55-
[assembly: AssemblyFileVersion("1.0.0.75")]
54+
[assembly: AssemblyVersion("1.0.0.86")]
55+
[assembly: AssemblyFileVersion("1.0.0.80")]
5656
[assembly: NeutralResourcesLanguage("en-US")]
5757

‎SinglePluginHost/SinglePluginHost.csproj

+14-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<PlatformTarget>x64</PlatformTarget>
4343
<ErrorReport>prompt</ErrorReport>
4444
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
45-
<Prefer32Bit>true</Prefer32Bit>
4645
</PropertyGroup>
4746
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
4847
<OutputPath>bin\x64\Release\</OutputPath>
@@ -52,7 +51,13 @@
5251
<PlatformTarget>x64</PlatformTarget>
5352
<ErrorReport>prompt</ErrorReport>
5453
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
55-
<Prefer32Bit>true</Prefer32Bit>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Travis|x64'">
56+
<OutputPath>bin\x64\Travis\</OutputPath>
57+
<DefineConstants>TRACE</DefineConstants>
58+
<Optimize>true</Optimize>
59+
<PlatformTarget>x64</PlatformTarget>
60+
<ErrorReport>prompt</ErrorReport>
5661
</PropertyGroup>
5762
<ItemGroup>
5863
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
@@ -168,12 +173,16 @@
168173
</ProjectReference>
169174
</ItemGroup>
170175
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
171-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
172-
<PostBuildEvent>if exist "$(SolutionDir)signfile.bat" call "$(SolutionDir)signfile.bat" "$(SolutionDir)" "$(Configuration)-$(Platform)" "$(TargetPath)"</PostBuildEvent>
173-
</PropertyGroup>
174176
<PropertyGroup>
175177
<PreBuildEvent>call "$(SolutionDir)updateversion.bat" "$(SolutionDir)" "$(SolutionPath)"</PreBuildEvent>
176178
</PropertyGroup>
179+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
180+
<PostBuildEvent>call "$(SolutionDir)updatecommit.bat" "$(SolutionDir)" "$(TargetPath)"</PostBuildEvent>
181+
</PropertyGroup>
182+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
183+
<PostBuildEvent>call "$(SolutionDir)updatecommit.bat" "$(SolutionDir)" "$(TargetPath)"
184+
if exist "$(SolutionDir)signfile.bat" call "$(SolutionDir)signfile.bat" "$(SolutionDir)" "$(Configuration)-$(Platform)" "$(TargetPath)"</PostBuildEvent>
185+
</PropertyGroup>
177186
<Import Project="..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.3\build\Fody.targets')" />
178187
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
179188
<PropertyGroup>

‎updatecommit.bat

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
if not exist "%~1..\Version Tools\GitCommitId.exe" goto error
2+
"%~1..\Version Tools\GitCommitId.exe" %2 -u
3+
goto end
4+
5+
:error
6+
echo Failed to update Commit Id.
7+
goto end
8+
9+
:end

0 commit comments

Comments
 (0)