Removed PrimaryOutputHarvest postbuild events, literal references, and directory - Installer is now part of the PdfScribe solution - VS 2013 Community (free) can use Votive.
This commit is contained in:
S T Chan
parent
94acda6c0d
commit
7a99042e8b
@ -1,6 +1,8 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual C# Express 2010
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.31101.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeUnitTests", "PdfScribeUnitTests\PdfScribeUnitTests.csproj", "{D387573C-D122-461C-B525-1545DBDB4FBA}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeCore", "PdfScribeCore\PdfScribeCore.csproj", "{1EAD8E9A-A123-4C37-B31E-AEE1354DF003}"
|
||||
@ -9,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribe", "PdfScribe\PdfS
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeInstallCustomAction", "PdfScribeInstallCustomAction\PdfScribeInstallCustomAction.csproj", "{E8679E1B-8C89-4201-97D5-7E43C5A486C9}"
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PdfScribeInstall", "PdfScribeInstall\PdfScribeInstall.wixproj", "{3C255536-A7F1-4913-9C7F-966DFFEE01BC}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -65,6 +69,17 @@ Global
|
||||
{E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x64.Build.0 = Release|x64
|
||||
{E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x86.ActiveCfg = Release|x86
|
||||
{E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x86.Build.0 = Release|x86
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x64.Build.0 = Debug|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x86.Build.0 = Debug|x86
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|Any CPU.ActiveCfg = Release|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|Any CPU.Build.0 = Release|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x64.ActiveCfg = Release|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x64.Build.0 = Release|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x86.ActiveCfg = Release|x86
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -141,9 +141,7 @@
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)PdfScribeInstall\PrimaryOutputHarvest\$(TargetFileName)"
|
||||
copy "$(TargetPath).config" "$(SolutionDir)PdfScribeInstall\PrimaryOutputHarvest\$(TargetFileName).config"
|
||||
copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)PdfScribeInstall\PrimaryOutputHarvest\$(TargetName).pdb"
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
||||
@ -107,8 +107,8 @@
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)PdfScribeInstall\PrimaryOutputHarvest\$(TargetFileName)"
|
||||
copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)PdfScribeInstall\PrimaryOutputHarvest\$(TargetName).pdb"</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual Studio 2010
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PdfScribeInstall", "PdfScribeInstall\PdfScribeInstall.wixproj", "{3C255536-A7F1-4913-9C7F-966DFFEE01BC}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x64.Build.0 = Debug|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x86.Build.0 = Debug|x86
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|Any CPU.ActiveCfg = Release|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x64.ActiveCfg = Release|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x64.Build.0 = Release|x64
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x86.ActiveCfg = Release|x86
|
||||
{3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@ -51,6 +51,32 @@
|
||||
<Name>WixNetFxExtension</Name>
|
||||
</WixExtension>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\PdfScribeCore\PdfScribeCore.csproj">
|
||||
<Name>PdfScribeCore</Name>
|
||||
<Project>{1ead8e9a-a123-4c37-b31e-aee1354df003}</Project>
|
||||
<Private>True</Private>
|
||||
<DoNotHarvest>True</DoNotHarvest>
|
||||
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\PdfScribeInstallCustomAction\PdfScribeInstallCustomAction.csproj">
|
||||
<Name>PdfScribeInstallCustomAction</Name>
|
||||
<Project>{e8679e1b-8c89-4201-97d5-7e43c5a486c9}</Project>
|
||||
<Private>True</Private>
|
||||
<DoNotHarvest>True</DoNotHarvest>
|
||||
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\PdfScribe\PdfScribe.csproj">
|
||||
<Name>PdfScribe</Name>
|
||||
<Project>{09bb3aa3-96d3-4ba1-bcb3-4e17067f42b2}</Project>
|
||||
<Private>True</Private>
|
||||
<DoNotHarvest>True</DoNotHarvest>
|
||||
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
||||
@ -1 +0,0 @@
|
||||
PLACE HOLDER TEXT FILE
|
||||
@ -30,7 +30,7 @@
|
||||
<Property Id="MSIUSEREALADMINDETECTION" Value="1" />
|
||||
|
||||
<!-- Custom Actions -->
|
||||
<Binary Id="PdfScribeInstallCustomAction.CA.dll" SourceFile="PrimaryOutputHarvest\PdfScribeInstallCustomAction.CA.dll" />
|
||||
<Binary Id="PdfScribeInstallCustomAction.CA.dll" SourceFile="$(var.PdfScribeInstallCustomAction.TargetDir)$(var.PdfScribeInstallCustomAction.TargetName).CA.dll" />
|
||||
<CustomAction Id="SetCustomActionDataValues"
|
||||
Return="check"
|
||||
Property="InstallPrinter"
|
||||
@ -69,31 +69,24 @@
|
||||
|
||||
<Fragment>
|
||||
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
|
||||
<!-- We copy everything from the PrimaryOutputHarvest directory
|
||||
instead of using a reference to the projects' primary output so
|
||||
that people using Visual C# Express 2010 can use Votive installed
|
||||
into the stand alone VS 2010 Integrated Shell - only the Pro (or better)
|
||||
versions of Visual Studio can load a Votive project into the same
|
||||
solution as the C# projects - that's why this install project
|
||||
is in its own solution -->
|
||||
<Component Id="PdfScribeBase" Guid="{7A339C63-AEA3-491C-8CB1-C78D21426EC1}">
|
||||
<File Id="PdfScribeExe" Source="PrimaryOutputHarvest\PdfScribe.exe" KeyPath="yes" >
|
||||
<netfx:NativeImage Id="PdfScribe.exe" Platform="64bit" Priority="1" />
|
||||
<File Id="PdfScribeExe" Source="$(var.PdfScribe.TargetPath)" KeyPath="yes" >
|
||||
<netfx:NativeImage Id="$(var.PdfScribe.TargetFileName)" Platform="64bit" Priority="1" />
|
||||
</File>
|
||||
</Component>
|
||||
<Component Id="PdfScribeExePdb" Guid="{52D6263A-E94A-47F4-A289-DA128457A341}">
|
||||
<File Source="PrimaryOutputHarvest\PdfScribe.pdb" KeyPath="yes" />
|
||||
<File Source="$(var.PdfScribe.TargetDir)$(var.PdfScribe.TargetName).pdb" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Id="PdfScribeExeConfig" Guid="{8665FD57-C8C8-46D2-9031-A1F826AB8FC0}">
|
||||
<File Source="PrimaryOutputHarvest\PdfScribe.exe.config" KeyPath="yes" />
|
||||
<File Source="$(var.PdfScribe.TargetDir)$(var.PdfScribe.TargetFileName).config" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Id="PdfScribeCoreDll" Guid="{4E776721-791F-47F4-A75C-186EA73640CE}">
|
||||
<File Source="PrimaryOutputHarvest\PdfScribeCore.dll" KeyPath="yes" >
|
||||
<netfx:NativeImage Id="PdfScribeCore.dll" Platform="64bit" Priority="1" />
|
||||
<File Source="$(var.PdfScribeCore.TargetPath)" KeyPath="yes" >
|
||||
<netfx:NativeImage Id="$(var.PdfScribeCore.TargetFileName)" Platform="64bit" Priority="1" />
|
||||
</File>
|
||||
</Component>
|
||||
<Component Id="PdfScribeCoreDllPdb" Guid="{8979618A-C1B1-40B6-A400-D8DAF159184D}">
|
||||
<File Source="PrimaryOutputHarvest\PdfScribeCore.pdb" KeyPath="yes" />
|
||||
<File Source="$(var.PdfScribeCore.TargetDir)$(var.PdfScribeCore.TargetName).pdb" KeyPath="yes" />
|
||||
</Component>
|
||||
<!-- Third party components -->
|
||||
<Component Id="gsdll64dll" Guid="{96C2E5A1-15AD-4B27-A184-7AC1C2F08409}">
|
||||
|
||||
@ -94,8 +94,7 @@
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(WixCATargetsPath)" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)PdfScribeInstall\PrimaryOutputHarvest\$(TargetFileName)"
|
||||
copy "$(TargetDir)$(TargetName).CA.dll" "$(SolutionDir)PdfScribeInstall\PrimaryOutputHarvest\$(TargetName).CA.dll"
|
||||
copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)PdfScribeInstall\PrimaryOutputHarvest\$(TargetName).pdb"</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
Loading…
Reference in New Issue
Block a user