Skip to content

Commit

Permalink
Merge pull request #2 from derco0n/testing
Browse files Browse the repository at this point in the history
  • Loading branch information
derco0n authored Sep 4, 2019
2 parents ea64b96 + 1ee1d9b commit 13d238f
Show file tree
Hide file tree
Showing 40 changed files with 2,169 additions and 76 deletions.
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
8 changes: 8 additions & 0 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"ExpandedNodes": [
"",
"\\Co0nSearchC"
],
"SelectedNode": "\\Co0nSearchC",
"PreviewInSolutionExplorer": false
}
1,015 changes: 1,015 additions & 0 deletions .vs/config/applicationhost.config

Large diffs are not rendered by default.

Binary file added .vs/slnx.sqlite
Binary file not shown.
10 changes: 10 additions & 0 deletions .vs/tasks.vs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.1",
"tasks": [
{
"taskName": "Task-CSearch-Installer",
"appliesTo": "CSearch-Installer/",
"type": "launch"
}
]
}
47 changes: 45 additions & 2 deletions CSearch.sln
Original file line number Diff line number Diff line change
@@ -1,29 +1,72 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 15 for Windows Desktop
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2026
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSearch", "Co0nSearchC\CSearch.csproj", "{C965BC14-83D0-40D5-A055-3C2BE8210691}"
ProjectSection(ProjectDependencies) = postProject
{4DE7935F-7954-4329-B40A-E0F03762D696} = {4DE7935F-7954-4329-B40A-E0F03762D696}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Co0nUtilZ", "..\..\..\..\..\mitgebrachtes\Entwicklungen\C#\Co0nUtilZ\Co0nUtilZ\Co0nUtilZ.csproj", "{4DE7935F-7954-4329-B40A-E0F03762D696}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Co0nUtilZ", "..\coonutils\Co0nUtilZ\Co0nUtilZ.csproj", "{4DE7935F-7954-4329-B40A-E0F03762D696}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{C648C1CB-FC11-45C0-A891-713B2CE45888}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Co0n_GUI", "..\..\Co0n_GUI\Co0n_GUI\Co0n_GUI\Co0n_GUI.csproj", "{EEF24D03-1187-4763-9998-BA98E43630AD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
x64|Any CPU = x64|Any CPU
x64|x64 = x64|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C965BC14-83D0-40D5-A055-3C2BE8210691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C965BC14-83D0-40D5-A055-3C2BE8210691}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C965BC14-83D0-40D5-A055-3C2BE8210691}.Debug|x64.ActiveCfg = Debug|x64
{C965BC14-83D0-40D5-A055-3C2BE8210691}.Debug|x64.Build.0 = Debug|x64
{C965BC14-83D0-40D5-A055-3C2BE8210691}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C965BC14-83D0-40D5-A055-3C2BE8210691}.Release|Any CPU.Build.0 = Release|Any CPU
{C965BC14-83D0-40D5-A055-3C2BE8210691}.Release|x64.ActiveCfg = Release|x64
{C965BC14-83D0-40D5-A055-3C2BE8210691}.Release|x64.Build.0 = Release|x64
{C965BC14-83D0-40D5-A055-3C2BE8210691}.x64|Any CPU.ActiveCfg = Release|Any CPU
{C965BC14-83D0-40D5-A055-3C2BE8210691}.x64|Any CPU.Build.0 = Release|Any CPU
{C965BC14-83D0-40D5-A055-3C2BE8210691}.x64|x64.ActiveCfg = Release|x64
{C965BC14-83D0-40D5-A055-3C2BE8210691}.x64|x64.Build.0 = Release|x64
{4DE7935F-7954-4329-B40A-E0F03762D696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.Debug|x64.ActiveCfg = Debug|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.Debug|x64.Build.0 = Debug|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.Release|Any CPU.Build.0 = Release|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.Release|x64.ActiveCfg = Release|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.Release|x64.Build.0 = Release|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.x64|Any CPU.ActiveCfg = x64|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.x64|Any CPU.Build.0 = x64|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.x64|x64.ActiveCfg = x64|Any CPU
{4DE7935F-7954-4329-B40A-E0F03762D696}.x64|x64.Build.0 = x64|Any CPU
{C648C1CB-FC11-45C0-A891-713B2CE45888}.Debug|Any CPU.ActiveCfg = Debug
{C648C1CB-FC11-45C0-A891-713B2CE45888}.Debug|x64.ActiveCfg = Debug
{C648C1CB-FC11-45C0-A891-713B2CE45888}.Release|Any CPU.ActiveCfg = Release
{C648C1CB-FC11-45C0-A891-713B2CE45888}.Release|Any CPU.Build.0 = Release
{C648C1CB-FC11-45C0-A891-713B2CE45888}.Release|x64.ActiveCfg = Release
{C648C1CB-FC11-45C0-A891-713B2CE45888}.x64|Any CPU.ActiveCfg = Release
{C648C1CB-FC11-45C0-A891-713B2CE45888}.x64|x64.ActiveCfg = Release
{EEF24D03-1187-4763-9998-BA98E43630AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.Debug|x64.ActiveCfg = Debug|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.Debug|x64.Build.0 = Debug|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.Release|Any CPU.Build.0 = Release|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.Release|x64.ActiveCfg = Release|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.Release|x64.Build.0 = Release|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.x64|Any CPU.ActiveCfg = Release|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.x64|Any CPU.Build.0 = Release|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.x64|x64.ActiveCfg = Release|Any CPU
{EEF24D03-1187-4763-9998-BA98E43630AD}.x64|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
20 changes: 18 additions & 2 deletions Co0nSearchC/CSearch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>F2C27C113FF455ED4178851B1CA496E9D1B812A6</ManifestCertificateThumbprint>
Expand Down Expand Up @@ -180,10 +180,26 @@
<Content Include="logo_small.ico" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\..\mitgebrachtes\Entwicklungen\C#\Co0nUtilZ\Co0nUtilZ\Co0nUtilZ.csproj">
<ProjectReference Include="..\..\..\Co0n_GUI\Co0n_GUI\Co0n_GUI\Co0n_GUI.csproj">
<Project>{eef24d03-1187-4763-9998-ba98e43630ad}</Project>
<Name>Co0n_GUI</Name>
</ProjectReference>
<ProjectReference Include="..\..\coonutils\Co0nUtilZ\Co0nUtilZ.csproj">
<Project>{4de7935f-7954-4329-b40a-e0f03762d696}</Project>
<Name>Co0nUtilZ</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PublishFile Include="GPL-License.txt">
<Visible>False</Visible>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
23 changes: 13 additions & 10 deletions Co0nSearchC/F_Main.Designer.cs

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

Loading

0 comments on commit 13d238f

Please sign in to comment.