Skip to content

Commit 6f2446c

Browse files
unalignedcoderunalignedcoder
committed
minor fixes
2 parents 2b4b66b + 354e87c commit 6f2446c

2 files changed

Lines changed: 55 additions & 47 deletions

File tree

‎CalibreImport/CalibreImport.csproj‎

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
43
<!-- Import common properties -->
54
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
6-
5+
<!-- -->
76
<!-- General Property Group -->
7+
<!-- -->
88
<PropertyGroup>
99
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1010
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -20,8 +20,9 @@
2020
<AssemblyOriginatorKeyFile>CalibreImportKey.snk</AssemblyOriginatorKeyFile>
2121
<SignAssembly>true</SignAssembly>
2222
</PropertyGroup>
23-
24-
<!-- Debug Configuration Property Group -->
23+
<!--
24+
Debug Configuration Property Group
25+
-->
2526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2627
<DebugSymbols>true</DebugSymbols>
2728
<DebugType>full</DebugType>
@@ -31,8 +32,9 @@
3132
<ErrorReport>prompt</ErrorReport>
3233
<WarningLevel>4</WarningLevel>
3334
</PropertyGroup>
34-
35-
<!-- Release Configuration Property Group -->
35+
<!--
36+
Release Configuration Property Group
37+
-->
3638
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3739
<DebugType>pdbonly</DebugType>
3840
<Optimize>true</Optimize>
@@ -41,8 +43,9 @@
4143
<ErrorReport>prompt</ErrorReport>
4244
<WarningLevel>4</WarningLevel>
4345
</PropertyGroup>
44-
45-
<!-- Debug x64 Configuration Property Group -->
46+
<!--
47+
Debug x64 Configuration Property Group
48+
-->
4649
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
4750
<DebugSymbols>true</DebugSymbols>
4851
<OutputPath>bin\x64\Debug\</OutputPath>
@@ -53,8 +56,9 @@
5356
<Optimize>false</Optimize>
5457
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
5558
</PropertyGroup>
56-
57-
<!-- Release x64 Configuration Property Group -->
59+
<!--
60+
Release x64 Configuration Property Group
61+
-->
5862
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
5963
<OutputPath>bin\x64\Release\</OutputPath>
6064
<DefineConstants>TRACE</DefineConstants>
@@ -63,8 +67,9 @@
6367
<PlatformTarget>x64</PlatformTarget>
6468
<ErrorReport>prompt</ErrorReport>
6569
</PropertyGroup>
66-
67-
<!-- References -->
70+
<!--
71+
References
72+
-->
6873
<ItemGroup>
6974
<Reference Include="System" />
7075
<Reference Include="System.Configuration" />
@@ -77,8 +82,9 @@
7782
<Reference Include="System.Configuration.Install" />
7883
<Reference Include="System.Xml" />
7984
</ItemGroup>
80-
81-
<!-- NuGet Package References -->
85+
<!--
86+
NuGet Package References
87+
-->
8288
<ItemGroup>
8389
<PackageReference Include="ILRepack">
8490
<Version>2.0.40</Version>
@@ -95,8 +101,9 @@
95101
<Version>9.0.3</Version>
96102
</PackageReference>
97103
</ItemGroup>
98-
99-
<!-- C# files being compiled -->
104+
<!--
105+
C# files being compiled
106+
-->
100107
<ItemGroup>
101108
<Compile Include="AutomergeOption.cs" />
102109
<Compile Include="BorderlessGroupBox.cs">
@@ -129,49 +136,50 @@
129136
<DependentUpon>SettingsForm.cs</DependentUpon>
130137
</Compile>
131138
</ItemGroup>
132-
133-
<!-- Resources for the Forms -->
139+
<!--
140+
Resources for the Forms
141+
-->
134142
<ItemGroup>
135143
<EmbeddedResource Include="ImportForm.resx">
136144
<DependentUpon>ImportForm.cs</DependentUpon>
137-
<SubType>Designer</SubType>
145+
<SubType>Designer</SubType>
138146
</EmbeddedResource>
139147
<EmbeddedResource Include="SettingsForm.resx">
140148
<DependentUpon>SettingsForm.cs</DependentUpon>
141149
<SubType>Designer</SubType>
142150
</EmbeddedResource>
143151
</ItemGroup>
144-
145-
<!-- Extra Files included in the Project (some in the Output too)-->
146-
<ItemGroup>
147-
<None Include="app.config" />
148-
<None Include="CalibreImportKey.snk" />
149-
<None Include="PostBuild.ps1" />
150-
<None Include="Properties\Settings.settings">
151-
<Generator>SettingsSingleFileGenerator</Generator>
152-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
153-
</None>
154-
<None Include="Setup.ps1">
155-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
156-
</None>
157-
<None Include="CustomSettings.config">
158-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
159-
</None>
160-
</ItemGroup>
161-
162-
<!-- Folder Item Group -->
152+
<!--
153+
Extra Files included in the Project (some in the Output too)
154+
-->
163155
<ItemGroup>
164-
<Folder Include="ReleaseFiles\" />
156+
<None Include="app.config" />
157+
<None Include="CalibreImportKey.snk" />
158+
<None Include="PostBuild.ps1" />
159+
<None Include="Properties\Settings.settings">
160+
<Generator>SettingsSingleFileGenerator</Generator>
161+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
162+
</None>
163+
<None Include="ReleaseFiles\CalibreImport.dll" />
164+
<None Include="ReleaseFiles\CustomSettings.config" />
165+
<None Include="ReleaseFiles\Setup.ps1" />
166+
<None Include="Setup.ps1">
167+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
168+
</None>
169+
<None Include="CustomSettings.config">
170+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
171+
</None>
165172
</ItemGroup>
166-
167-
<!-- Import CSharp targets -->
173+
<!--
174+
Import CSharp targets
175+
-->
168176
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
169-
170-
<!-- PostBuild Target (runs a powershell postbuiold script which contains repack instructions-->
177+
<!--
178+
PostBuild Target (runs a powershell postbuiold script which contains repack instructions
179+
-->
171180
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
172181
<Message Text="Running PostBuild script..." Importance="high" />
173182
<Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)PostBuild.ps1&quot; -TargetDir &quot;$(TargetDir.TrimEnd('\&quot;'))&quot; -ProjectDir &quot;$(ProjectDir.TrimEnd('\&quot;'))&quot;" />
174183
<Message Text="PostBuild script completed." Importance="high" />
175184
</Target>
176-
177-
</Project>
185+
</Project>

‎CalibreImport/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// Build Number
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("1.0.2.9")]
33-
[assembly: AssemblyFileVersion("1.0.2.9")]
32+
[assembly: AssemblyVersion("1.0.3.0")]
33+
[assembly: AssemblyFileVersion("1.0.3.0")]

0 commit comments

Comments
 (0)