Re-organized solution, added Setup project

This commit is contained in:
unknown 2013-02-16 19:00:35 -05:00
parent 2b0bf4c17e
commit dc15b34b5c
97 changed files with 6041 additions and 109 deletions

30
.gitignore vendored
View File

@ -1,29 +1 @@
Thumbs.db
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.sln.docstates
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
[Bb]in
[Dd]ebug*/
*.lib
*.sbr
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
*.vssscc
$tf*/
Desktop.ini

View File

@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<VSPerformanceSession Version="1.00">
<Options>
<Solution>NAPS.sln</Solution>
<CollectionMethod>Sampling</CollectionMethod>
<AllocationMethod>Allocation</AllocationMethod>
<AddReport>true</AddReport>
<ResourceBasedAnalysisSelected>true</ResourceBasedAnalysisSelected>
<UniqueReport>Timestamp</UniqueReport>
<SamplingMethod>Cycles</SamplingMethod>
<CycleCount>10000000</CycleCount>
<PageFaultCount>10</PageFaultCount>
<SysCallCount>10</SysCallCount>
<SamplingCounter Name="" ReloadValue="00000000000f4240" DisplayName="" />
<RelocateBinaries>false</RelocateBinaries>
<HardwareCounters EnableHWCounters="false" />
<EtwSettings />
<PdhSettings>
<PdhCountersEnabled>false</PdhCountersEnabled>
<PdhCountersRate>500</PdhCountersRate>
<PdhCounters>
<PdhCounter>\Memory\Pages/sec</PdhCounter>
<PdhCounter>\PhysicalDisk(_Total)\Avg. Disk Queue Length</PdhCounter>
<PdhCounter>\Processor(_Total)\% Processor Time</PdhCounter>
</PdhCounters>
</PdhSettings>
</Options>
<ExcludeSmallFuncs>true</ExcludeSmallFuncs>
<InteractionProfilingEnabled>false</InteractionProfilingEnabled>
<JScriptProfilingEnabled>false</JScriptProfilingEnabled>
<PreinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PreinstrumentEvent>
<PostinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PostinstrumentEvent>
<Binaries>
<ProjBinary>
<Path>obj\Debug\NAPS.exe</Path>
<ArgumentTimestamp>01/01/0001 00:00:00</ArgumentTimestamp>
<Instrument>true</Instrument>
<Sample>true</Sample>
<ExternalWebsite>false</ExternalWebsite>
<InteractionProfilingEnabled>false</InteractionProfilingEnabled>
<IsLocalJavascript>false</IsLocalJavascript>
<IsWindowsStoreApp>false</IsWindowsStoreApp>
<IsWWA>false</IsWWA>
<LaunchProject>true</LaunchProject>
<OverrideProjectSettings>false</OverrideProjectSettings>
<LaunchMethod>Executable</LaunchMethod>
<ExecutablePath>bin\Debug\NAPS.exe</ExecutablePath>
<StartupDirectory>bin\Debug\</StartupDirectory>
<Arguments>
</Arguments>
<NetAppHost>IIS</NetAppHost>
<NetBrowser>InternetExplorer</NetBrowser>
<ExcludeSmallFuncs>true</ExcludeSmallFuncs>
<JScriptProfilingEnabled>false</JScriptProfilingEnabled>
<PreinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PreinstrumentEvent>
<PostinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PostinstrumentEvent>
<ProjRef>{EAC4A133-93BE-4400-BFA9-CEB1615693C4}|NAPS.csproj</ProjRef>
<ProjPath>NAPS.csproj</ProjPath>
<ProjName>NAPS</ProjName>
</ProjBinary>
</Binaries>
<Reports>
<Report>
<Path>NAPS120927.vsp</Path>
</Report>
</Reports>
<Launches>
<ProjBinary>
<Path>:PB:{EAC4A133-93BE-4400-BFA9-CEB1615693C4}|NAPS.csproj</Path>
</ProjBinary>
</Launches>
</VSPerformanceSession>

48
NAPS2.sln Normal file
View File

@ -0,0 +1,48 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAPS2", "naps\NAPS2.csproj", "{EAC4A133-93BE-4400-BFA9-CEB1615693C4}"
EndProject
Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "Setup", "Setup\Setup.isproj", "{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}"
ProjectSection(ProjectDependencies) = postProject
{EAC4A133-93BE-4400-BFA9-CEB1615693C4} = {EAC4A133-93BE-4400-BFA9-CEB1615693C4}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CD_ROM|Any CPU = CD_ROM|Any CPU
Debug|Any CPU = Debug|Any CPU
DVD-5|Any CPU = DVD-5|Any CPU
Release|Any CPU = Release|Any CPU
SingleImage|Any CPU = SingleImage|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Release|Any CPU.Build.0 = Release|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
{EAC4A133-93BE-4400-BFA9-CEB1615693C4}.SingleImage|Any CPU.Build.0 = Release|Any CPU
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.CD_ROM|Any CPU.ActiveCfg = CD_ROM
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.CD_ROM|Any CPU.Build.0 = CD_ROM
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.Debug|Any CPU.ActiveCfg = DVD-5
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.Debug|Any CPU.Build.0 = DVD-5
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.DVD-5|Any CPU.ActiveCfg = DVD-5
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.DVD-5|Any CPU.Build.0 = DVD-5
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.Release|Any CPU.ActiveCfg = SingleImage
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.Release|Any CPU.Build.0 = SingleImage
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.SingleImage|Any CPU.ActiveCfg = SingleImage
{5F9C3065-9BFF-4C71-9ECF-0CCBBE0BB351}.SingleImage|Any CPU.Build.0 = SingleImage
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(SubversionScc) = preSolution
Svn-Managed = True
Manager = AnkhSVN - Subversion Support for Visual Studio
EndGlobalSection
EndGlobal

BIN
NAPS2.suo Normal file

Binary file not shown.

BIN
NAPS2.v11.suo Normal file

Binary file not shown.

1
Setup/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
Setup/

5924
Setup/Setup.isl Normal file

File diff suppressed because it is too large Load Diff

36
Setup/Setup.isproj Normal file
View File

@ -0,0 +1,36 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<!-- Select a Product Configuration -->
<InstallShieldProductConfiguration>Express</InstallShieldProductConfiguration>
<!-- Select a Visual Studio Configuration / InstallShield Release -->
<Configuration>Debug</Configuration>
<InstallShieldRelease>$(Configuration)</InstallShieldRelease>
</PropertyGroup>
<ItemGroup>
<!-- The InstallShieldProject item selects the project to build -->
<InstallShieldProject Include="$(MSBuildProjectDirectory)\$(MSBuildProjectName).isl"/>
<!-- The InstallShieldReleaseFlags sets Release Flags -->
<!--<InstallShieldReleaseFlags Include=""/>-->
<!-- The InstallShieldMergeModulePath specifies what directories are
searched for Merge Modules -->
<!--<InstallShieldMergeModulePath Include=""/>-->
</ItemGroup>
<ItemGroup>
<!-- The ProjectReference items refer to any Visual Studio solutions you want to automatically probe for Project Output Groups. -->
</ItemGroup>
<ItemGroup>
<!-- The TaggedOutputs items allow you to explicitly add extra files to output groups. Each item must include both Name and OutputGroup, as well as TargetPath metadata values. -->
<!--<TaggedOutputs Include="C:\My Test Exe.exe">
<Name>My Test Project</Name>
<OutputGroup>Primary output</OutputGroup>
<TargetPath>My Test Exe.exe</TargetPath>
</TaggedOutputs> -->
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\InstallShield\2012SpringLimited\InstallShield.targets"/>
<ItemGroup>
<ProjectReference Include="..\naps\NAPS2.csproj">
<Name>NAPS2</Name>
<Project>{EAC4A133-93BE-4400-BFA9-CEB1615693C4}</Project>
</ProjectReference>
</ItemGroup>
</Project>

31
naps/.gitignore vendored Normal file
View File

@ -0,0 +1,31 @@
Thumbs.db
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.sln.docstates
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
[Bb]in
[Dd]ebug*/
*.lib
*.sbr
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
*.vssscc
$tf*/
publish/
bin/

BIN
naps/NAPS_TemporaryKey.pfx Normal file

Binary file not shown.

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 913 B

After

Width:  |  Height:  |  Size: 913 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 960 B

After

Width:  |  Height:  |  Size: 960 B

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB