stopping for now

This commit is contained in:
Tommy Parnell
2017-02-09 00:34:12 -05:00
parent 8b874a864c
commit f606b596a9
3 changed files with 23 additions and 21 deletions

View File

@@ -45,7 +45,7 @@ namespace QuikPak
{
Dirs = new[]
{
new Dir(new Id("IISMain"), config.Name + "_" +config.Version.ToString() +"_Web",
new Dir(new Id("IISMain"), config.Name + "_" +config.Version +"_Web",
new Files(System.IO.Path.Combine(options.Path, "**")),
new File(options.Config,
@@ -77,6 +77,7 @@ namespace QuikPak
PreserveTempFiles = true,
UpgradeCode = new Guid(config.UpgradeCode),
};
project.Certificates = new Certificate[] { new Certificate() { PFXPassword = "password", CertificatePath = @"c:\bin\a.pfx", Request = false, StoreName = StoreName.personal, StoreLocation = StoreLocation.localMachine, Name = "cert1" } };
project.Properties.Add(new Property("REINSTALLMODE", "dmus"));
project.MajorUpgrade = new MajorUpgrade() { AllowDowngrades = true, Schedule = UpgradeSchedule.afterInstallInitialize };
project.MajorUpgradeStrategy = new MajorUpgradeStrategy()
@@ -90,7 +91,8 @@ namespace QuikPak
},
RemoveExistingProductAfter = Step.InstallInitialize
};
Compiler.BuildMsi(project);
Compiler.BuildWxs(project);
//Compiler.BuildMsi(project);
}
}
}
}

View File

@@ -35,7 +35,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="BootstrapperCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\BootstrapperCore.dll</HintPath>
<HintPath>..\packages\WixSharp.bin.1.3.0.0\lib\BootstrapperCore.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
@@ -43,7 +43,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Deployment.WindowsInstaller, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
<HintPath>..\packages\WixSharp.bin.1.3.0.0\lib\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -58,16 +58,16 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WixSharp, Version=1.0.35.3, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.dll</HintPath>
<Reference Include="WixSharp, Version=1.3.0.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.3.0.0\lib\WixSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WixSharp.Msi, Version=1.0.35.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.Msi.dll</HintPath>
<Reference Include="WixSharp.Msi, Version=1.3.0.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.3.0.0\lib\WixSharp.Msi.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WixSharp.UI, Version=1.0.35.2, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.UI.dll</HintPath>
<Reference Include="WixSharp.UI, Version=1.3.0.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.3.0.0\lib\WixSharp.UI.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -83,13 +83,6 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\WixSharp.1.0.35.3\build\WixSharp.targets" Condition="Exists('..\packages\WixSharp.1.0.35.3\build\WixSharp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\WixSharp.1.0.35.3\build\WixSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixSharp.1.0.35.3\build\WixSharp.targets'))" />
</Target>
<!-- 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.
<Target Name="BeforeBuild">
@@ -97,5 +90,12 @@
<Target Name="AfterBuild">
</Target>
-->
<UsingTask AssemblyFile="packages\WixSharp.1.0.35.3\build\SetEnvVar.dll" TaskName="SetEnvVar" />
<Import Project="..\packages\WixSharp.1.3.0.0\build\WixSharp.targets" Condition="Exists('..\packages\WixSharp.1.3.0.0\build\WixSharp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\WixSharp.1.3.0.0\build\WixSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixSharp.1.3.0.0\build\WixSharp.targets'))" />
</Target>
<UsingTask AssemblyFile="$(SolutionDir)packages\WixSharp.1.3.0.0\build\SetEnvVar.dll" TaskName="SetEnvVar" />
</Project>

View File

@@ -2,6 +2,6 @@
<packages>
<package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="WixSharp" version="1.0.35.3" targetFramework="net45" />
<package id="WixSharp.bin" version="1.0.35.3" targetFramework="net45" />
<package id="WixSharp" version="1.3.0.0" targetFramework="net45" />
<package id="WixSharp.bin" version="1.3.0.0" targetFramework="net45" />
</packages>