Skip to content
This repository has been archived by the owner on Aug 20, 2020. It is now read-only.

Commit

Permalink
.net issue fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Georgy Grigoryev committed Oct 1, 2018
1 parent 9cc6889 commit 29b28d0
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 1,050 deletions.
2 changes: 1 addition & 1 deletion CreatePlgX.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ xcopy "QuickSearch" PlgX /s /e /exclude:PlgXExclude.txt

echo Compiling PlgX
echo "%~dp0PlgX"
"../KeePass-Source/Build/KeePass/Release/KeePass.exe" /plgx-create "%~dp0PlgX"
"../KeePass2.x/Build/KeePass/Release/KeePass.exe" /plgx-create "%~dp0PlgX"

echo Releasing PlgX
move /y PlgX.plgx "Releases\Build Outputs\QuickSearch.plgx"
Expand Down
2 changes: 1 addition & 1 deletion QuickSearch/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.28.*")]
[assembly: AssemblyVersion("2.29.*")]
10 changes: 8 additions & 2 deletions QuickSearch/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions QuickSearch/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions QuickSearch/QuickSearch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>QuickSearch</RootNamespace>
<AssemblyName>QuickSearch</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\KeePass-Source\Build\KeePass\Debug\Plugins\QuickSearch\</OutputPath>
<OutputPath>..\..\KeePass2.x\Build\KeePass\Debug\Plugins\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -117,6 +118,12 @@
<ItemGroup>
<None Include="Resources\Icon1.ico" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\KeePass2.x\KeePass\KeePass.csproj">
<Project>{10938016-dee2-4a25-9a5a-8fd3444379ca}</Project>
<Name>KeePass</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>IF $(ConfigurationName) == Release "$(ProjectDir)..\CreatePlgX.bat"</PostBuildEvent>
Expand All @@ -128,4 +135,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
12 changes: 7 additions & 5 deletions QuickSearch/QuickSearch.sln
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2036
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickSearch", "QuickSearch.csproj", "{67A571CA-77D2-4820-A87D-C82366D08404}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "..\..\KeePass-Source\KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "..\..\KeePass2.x\KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{28396027-E3B4-4744-A0A7-B488A9FAA502}"
ProjectSection(SolutionItems) = preProject
..\Releases\PackageRelease.bat = ..\Releases\PackageRelease.bat
..\Readme.txt = ..\Readme.txt
..\Readme.md = ..\Readme.md
EndProjectSection
EndProject
Global
Expand All @@ -31,4 +30,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C8B742FA-F057-475F-8029-4DD00C65B818}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion QuickSearch/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
</setting>
</QuickSearch.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
Loading

0 comments on commit 29b28d0

Please sign in to comment.